Merge branch 'development' of gitlab.com:mbugroup/lti-web-client into feat/FE/US-334/TASK-344-345-slicing-and-integrate-expedition-hpp-report-table

2026-05-20 13:32:00 +00:00 · 2025-12-11 14:00:19 +07:00
parent 1ef7130661 df632526d2
commit 3c03494bd3
113 changed files with 6137 additions and 3555 deletions
@@ -127,6 +127,7 @@ build:dev:
    NEXT_PUBLIC_LTI_URL: 'https://dev-lti-erp.mbugroup.id'
    NEXT_PUBLIC_SSO_LOGIN_URL: 'https://dev-auth-erp.mbugroup.id'
    NEXT_PUBLIC_API_BASE_URL: 'https://dev-api-lti.mbugroup.id/api'
+    NEXT_PUBLIC_CLIENT_ID: 'Lumbung-Telur-Indonesia'

 deploy:dev:
  <<: *deploy_template
@@ -3,6 +3,7 @@ import type { NextConfig } from 'next';
 const nextConfig: NextConfig = {
  output: 'export',
  images: { unoptimized: true },
+  trailingSlash: true,
 };

 export default nextConfig;
@@ -36,9 +36,9 @@
        "@types/node": "^20",
        "@types/react": "^19",
        "@types/react-dom": "^19",
-        "daisyui": "^5.1.12",
+        "daisyui": "^5.5.8",
        "eslint": "^9",
-        "eslint-config-next": "15.5.3",
+        "eslint-config-next": "^15.5.7",
        "husky": "^9.1.7",
        "prettier": "^3.6.2",
        "tailwindcss": "^4",
@@ -1088,9 +1088,9 @@
      "license": "MIT"
    },
    "node_modules/@next/eslint-plugin-next": {
-      "version": "15.5.3",
-      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-15.5.3.tgz",
-      "integrity": "sha512-SdhaKdko6dpsSr0DldkESItVrnPYB1NS2NpShCSX5lc7SSQmLZt5Mug6t2xbiuVWEVDLZSuIAoQyYVBYp0dR5g==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-15.5.7.tgz",
+      "integrity": "sha512-DtRU2N7BkGr8r+pExfuWHwMEPX5SD57FeA6pxdgCHODo+b/UgIgjE+rgWKtJAbEbGhVZ2jtHn4g3wNhWFoNBQQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -3067,9 +3067,9 @@
      "peer": true
    },
    "node_modules/daisyui": {
-      "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-5.3.10.tgz",
-      "integrity": "sha512-vmjyPmm0hvFhA95KB6uiGmWakziB2pBv6CUcs5Ka/3iMBMn9S+C3SZYx9G9l2JrgTZ1EFn61F/HrPcwaUm2kLQ==",
+      "version": "5.5.8",
+      "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-5.5.8.tgz",
+      "integrity": "sha512-6psL9jIEOFOw68V10j/BKCWcRgx8dh81mmNxShr+g7HDM6UHNoPharlp9zq/PQkHNuGU1ZQsajR3HgpvavbRKQ==",
      "dev": true,
      "license": "MIT",
      "funding": {
@@ -3576,13 +3576,13 @@
      }
    },
    "node_modules/eslint-config-next": {
-      "version": "15.5.3",
-      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-15.5.3.tgz",
-      "integrity": "sha512-e6j+QhQFOr5pfsc8VJbuTD9xTXJaRvMHYjEeLPA2pFkheNlgPLCkxdvhxhfuM4KGcqSZj2qEnpHisdTVs3BxuQ==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-15.5.7.tgz",
+      "integrity": "sha512-nU/TRGHHeG81NeLW5DeQT5t6BDUqbpsNQTvef1ld/tqHT+/zTx60/TIhKnmPISTTe++DVo+DLxDmk4rnwHaZVw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@next/eslint-plugin-next": "15.5.3",
+        "@next/eslint-plugin-next": "15.5.7",
        "@rushstack/eslint-patch": "^1.10.3",
        "@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",
        "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",
@@ -39,9 +39,9 @@
    "@types/node": "^20",
    "@types/react": "^19",
    "@types/react-dom": "^19",
-    "daisyui": "^5.1.12",
+    "daisyui": "^5.5.8",
    "eslint": "^9",
-    "eslint-config-next": "15.5.3",
+    "eslint-config-next": "^15.5.7",
    "husky": "^9.1.7",
    "prettier": "^3.6.2",
    "tailwindcss": "^4",
@@ -1,82 +0,0 @@
-'use client';
-
-import { useRouter, useSearchParams } from 'next/navigation';
-import useSWR from 'swr';
-import { useId } from 'react';
-import SalesReportTable from '@/components/pages/closing/sale/SalesReportTable';
-import CosExpeditionReportTable from '@/components/pages/closing/hpp-ekspedisi/CosExpeditionReportTable';
-import { ClosingApi } from '@/services/api/closing';
-import { isResponseSuccess, isResponseError } from '@/lib/api-helper';
-
-const ClosingDetailPage = () => {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-  const penjualanId = useId();
-  const hppEkspedisiId = useId();
-
-  const closingId = searchParams.get('closingId');
-
-  const { data: closing, isLoading: isLoadingClosing } = useSWR(
-    closingId ? `${closingId}-${penjualanId}` : null,
-    (id: string) => {
-      const numericId = parseInt(id.split('-')[0], 10);
-      if (isNaN(numericId) || numericId <= 0) {
-        throw new Error('Invalid closing ID');
-      }
-      return ClosingApi.getPenjualan(numericId);
-    }
-  );
-
-  const { data: hpp_ekspedisi, isLoading: isLoadingHppEkspedisi } = useSWR(
-    closingId ? `${closingId}-${hppEkspedisiId}` : null,
-    (id: string) => {
-      const numericId = parseInt(id.split('-')[0], 10);
-      if (isNaN(numericId) || numericId <= 0) {
-        throw new Error('Invalid closing ID');
-      }
-      return ClosingApi.getHppEkspedisi(numericId);
-    }
-  );
-
-  const isLoading = isLoadingClosing || isLoadingHppEkspedisi;
-
-  if (!closingId) {
-    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 (
-    !isLoadingClosing &&
-    (!closing || isResponseError(closing)) &&
-    (!hpp_ekspedisi || isResponseError(hpp_ekspedisi))
-  ) {
-    router.replace('/404');
-    return;
-  }
-
-  return (
-    <div className='w-full p-4'>
-      {isLoading && (
-        <div className='w-full flex flex-row justify-center items-center'>
-          <span className='loading loading-spinner loading-xl' />
-        </div>
-      )}
-      {!isLoading && isResponseSuccess(closing) && (
-        <SalesReportTable type='detail' initialValues={closing.data} />
-      )}
-      {!isLoading && isResponseSuccess(hpp_ekspedisi) && (
-        <CosExpeditionReportTable
-          type='detail'
-          initialValues={hpp_ekspedisi.data}
-        />
-      )}
-    </div>
-  );
-};
-
-export default ClosingDetailPage;
@@ -0,0 +1,59 @@
+'use client';
+
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+
+import ClosingDetail from '@/components/pages/closing/ClosingDetail';
+
+import { ClosingApi } from '@/services/api/closing';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+
+const ClosingDetailPage = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const closingId = searchParams.get('closingId');
+
+  const { data: closing, isLoading: isLoadingClosing } = useSWR(
+    closingId,
+    (id: number) => ClosingApi.getGeneralInfo(id)
+  );
+
+  const { data: salesData, isLoading: isLoadingSales } = useSWR(
+    closingId ? `sales-${closingId}` : null,
+    () => ClosingApi.getPenjualan(Number(closingId))
+  );
+
+  if (!closingId) {
+    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 (!isLoadingClosing && (!closing || isResponseError(closing))) {
+    router.replace('/404');
+    return;
+  }
+
+  const isLoading = isLoadingClosing || isLoadingSales;
+
+  return (
+    <div className='w-full p-4 flex flex-row justify-center'>
+      {isLoading && <span className='loading loading-spinner loading-xl' />}
+
+      {!isLoading && isResponseSuccess(closing) && (
+        <ClosingDetail
+          id={Number(closingId)}
+          initialValue={closing.data}
+          salesData={isResponseSuccess(salesData) ? salesData.data : undefined}
+        />
+      )}
+    </div>
+  );
+};
+
+export default ClosingDetailPage;
@@ -0,0 +1,11 @@
+import ClosingsTable from '@/components/pages/closing/ClosingsTable';
+
+const Closing = () => {
+  return (
+    <section className='w-full p-4'>
+      <ClosingsTable />
+    </section>
+  );
+};
+
+export default Closing;
@@ -7,26 +7,39 @@
  default: false;
  prefersdark: false;
  color-scheme: 'light';
-  --color-base-100: oklch(98% 0.001 106.423);
-  --color-base-200: oklch(97% 0.001 106.424);
-  --color-base-300: oklch(92% 0.003 48.717);
-  --color-base-content: oklch(22.389% 0.031 278.072);
-  --color-primary: oklch(60% 0.126 221.723);
-  --color-primary-content: oklch(100% 0 0);
-  --color-secondary: oklch(52% 0.105 223.128);
-  --color-secondary-content: oklch(100% 0 0);
-  --color-accent: oklch(45% 0.085 224.283);
-  --color-accent-content: oklch(100% 0 0);
-  --color-neutral: oklch(39% 0.07 227.392);
-  --color-neutral-content: oklch(100% 0 0);
-  --color-info: oklch(58% 0.158 241.966);
-  --color-info-content: oklch(100% 0 0);
-  --color-success: oklch(62% 0.194 149.214);
-  --color-success-content: oklch(100% 0 0);
-  --color-warning: oklch(85% 0.199 91.936);
-  --color-warning-content: oklch(0% 0 0);
-  --color-error: oklch(57% 0.245 27.325);
-  --color-error-content: oklch(100% 0 0);
+
+  /* Primary Colors */
+  --color-primary: oklch(39.4% 0.177 301.9);
+  --color-primary-content: oklch(87.5% 0.038 274.5);
+
+  /* Secondary Colors */
+  --color-secondary: oklch(60.1% 0.258 335.7);
+  --color-secondary-content: oklch(99.4% 0.007 337.8);
+
+  /* Accent Colors */
+  --color-accent: oklch(76.2% 0.155 170.8);
+  --color-accent-content: oklch(7.2% 0.007 167.6);
+
+  /* Neutral Colors */
+  --color-neutral: oklch(22.4% 0.032 258.8);
+  --color-neutral-content: oklch(87.7% 0.016 257);
+
+  /* Base Colors */
+  --color-base-100: oklch(100% 0 0); /* #ffffff */
+  --color-base-200: oklch(97.2% 0 0); /* #f2f2f2 */
+  --color-base-300: oklch(93.1% 0.002 249.7); /* #e5e6e6 */
+  --color-base-content: oklch(18.6% 0.024 257.7); /* #1f2937 */
+
+  /* Status/Utility Colors */
+  --color-info: oklch(67.4% 0.176 238.9);
+  --color-info-content: oklch(0% 0 0); /* #000000 */
+  --color-success: oklch(62.3% 0.147 149);
+  --color-success-content: oklch(100% 0 0); /* #ffffff */
+  --color-warning: oklch(82.2% 0.165 91.9);
+  --color-warning-content: oklch(0% 0 0); /* #000000 */
+  --color-error: oklch(61.8% 0.203 27.8);
+  --color-error-content: oklch(100% 0 0); /* #fffffff */
+
  --radius-selector: 0rem;
  --radius-field: 0.25rem;
  --radius-box: 0.25rem;
@@ -43,6 +56,12 @@

@theme {
  --font-inter: var(--font-inter);
+
+  --container-sm: 40rem;
+  --container-md: 48rem;
+  --container-lg: 64rem;
+  --container-xl: 80rem;
+  --container-2xl: 96rem;
 }

 html {
@@ -12,8 +12,6 @@ const DetailInventoryAdjustment = () => {

  // Ambil data dari router state
  useEffect(() => {
-    console.log('Router State');
-    console.log(window.history.state);
    const state = window.history.state?.usr as
      | { inventoryAdjustment?: InventoryAdjustment }
      | undefined;
@@ -26,9 +24,6 @@ const DetailInventoryAdjustment = () => {

  const finalData = inventoryAdjustment;

-  console.log('Final Data');
-  console.log(finalData);
-
  if (!finalData) {
    return (
      <div className='w-full flex flex-row justify-center items-center p-4'>
@@ -0,0 +1,50 @@
+'use client';
+
+import InventoryProductDetail from '@/components/pages/inventory/product/detail/InventoryProductDetail';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { InventoryProductApi } from '@/services/api/inventory';
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+
+const InventoryProductDetailPage = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const inventoryProductId = searchParams.get('inventoryProductId');
+
+  const { data: inventoryProduct, isLoading: isLoadingInventoryProduct } =
+    useSWR(inventoryProductId, (id: number) =>
+      InventoryProductApi.getSingle(id)
+    );
+
+  if (!inventoryProductId) {
+    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 (
+    !isLoadingInventoryProduct &&
+    (!inventoryProduct || isResponseError(inventoryProduct))
+  ) {
+    router.replace('/404');
+    return;
+  }
+
+  return (
+    <div className='size-full'>
+      {isLoadingInventoryProduct && (
+        <span className='loading loading-spinner loading-xl' />
+      )}
+      {!isLoadingInventoryProduct && isResponseSuccess(inventoryProduct) && (
+        <InventoryProductDetail inventoryProduct={inventoryProduct.data} />
+      )}
+    </div>
+  );
+};
+
+export default InventoryProductDetailPage;
@@ -0,0 +1,11 @@
+import InventoryProductTable from '@/components/pages/inventory/product/InventoryProductTable';
+
+const InventoryProductPage = () => {
+  return (
+    <div className='size-full'>
+      <InventoryProductTable />
+    </div>
+  );
+};
+
+export default InventoryProductPage;
@@ -7,4 +7,5 @@ const Marketing = () => {
    </div>
  );
 };
+
 export default Marketing;
@@ -1,11 +1,29 @@
-import { redirect } from 'next/navigation';
+'use client';
+
+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() {
-  redirect('/dashboard');
+  const { user, isLoadingUser } = useAuth();

+  const router = useRouter();
+  const pathname = usePathname();
+
+  useEffect(() => {
+    if (pathname === '/') {
+      router.replace('/dashboard');
+    }
+  }, [pathname]);
+
+  if (isLoadingUser) {
    return (
      <main className='w-full h-full min-h-screen flex flex-row justify-center items-center'>
-      <h1>LTI ERP</h1>
+        <span className='loading loading-spinner loading-lg'></span>
      </main>
    );
+  }
+
+  return <>Loading...</>;
 }
@@ -1,10 +1,18 @@
 'use client';

 import ProjectFlockForm from '@/components/pages/production/project-flock/form/ProjectFlockForm';
+import React, { useImperativeHandle } from 'react';
+import toast from 'react-hot-toast';

 const AddProjectFlock = () => {
+  // useImperativeHandle(ref, () => ({
+  //   validate() {
+  //     toast.success('Validating');
+  //     return false;
+  //   },
+  // }));
  return (
-    <section className='w-full p-4 flex flex-row justify-center'>
+    <section className='w-full flex flex-row justify-center'>
      <ProjectFlockForm formType='add' />
    </section>
  );
@@ -44,7 +44,7 @@ export default function AddChickinKandang() {

  return (
    <>
-      <section className='w-full p-4'>
+      <section className='size-full'>
        {isLoading && <span className='loading loading-spinner loading-xl' />}
        {!isLoading &&
          isResponseSuccess(projectFlockKandang) &&
@@ -10,7 +10,7 @@ const AddChickin = () => {

  return (
    <>
-      <section className='w-full p-4'>
+      <section className='w-full'>
        <ProjectFlockChickinDetail projectFlockId={Number(projectFlockId)} />
      </section>
    </>
@@ -2,7 +2,7 @@ import ChickinTable from '@/components/pages/production/chickin/ChickinTable';

 const Chickin = () => {
  return (
-    <section className='w-full p-4'>
+    <section className='w-full'>
      <ChickinTable />
    </section>
  );
@@ -0,0 +1,11 @@
+import SuspenseHelper from '@/components/helper/SuspenseHelper';
+
+const Layout = ({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) => {
+  return <SuspenseHelper>{children}</SuspenseHelper>;
+};
+
+export default Layout;
@@ -0,0 +1,63 @@
+'use client';
+import ProjectFlockClosingForm from '@/components/pages/production/project-flock/closing/ProjectFlockClosingForm';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { ProjectFlockKandangApi } from '@/services/api/production';
+import { ProjectFlockApi } from '@/services/api/production/project-flock';
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+
+const ProjectFlockClosingPage = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const projectFlockId = searchParams.get('projectFlockId');
+  const projectFlockKandangId = searchParams.get('projectFlockKandangId');
+
+  const { data: projectFlockKandang, isLoading: isLoadingProjectFlockKandang } =
+    useSWR(projectFlockKandangId, (id: number) =>
+      ProjectFlockKandangApi.getSingle(id)
+    );
+
+  const { data: projectFlock, isLoading: isLoadingProjectFlock } = useSWR(
+    projectFlockId,
+    (id: number) => ProjectFlockApi.getSingle(id)
+  );
+
+  if (!projectFlockId || !projectFlockKandangId) {
+    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 (
+    !isLoadingProjectFlock &&
+    (!projectFlock || isResponseError(projectFlock)) &&
+    !isLoadingProjectFlockKandang &&
+    (!projectFlockKandang || isResponseError(projectFlockKandang))
+  ) {
+    router.replace('/404');
+    return;
+  }
+
+  return (
+    <div className='w-full h-full flex flex-col justify-center'>
+      {isLoadingProjectFlock ||
+        (isLoadingProjectFlockKandang && (
+          <span className='loading loading-spinner loading-xl' />
+        ))}
+      {isResponseSuccess(projectFlock) &&
+        isResponseSuccess(projectFlockKandang) && (
+          <ProjectFlockClosingForm
+            projectFlock={projectFlock.data}
+            projectFlockKandang={projectFlockKandang.data}
+          />
+        )}
+    </div>
+  );
+};
+
+export default ProjectFlockClosingPage;
@@ -37,7 +37,7 @@ const ProjectFlockEdit = () => {
  }

  return (
-    <div className='w-full p-4 flex flex-col justify-center'>
+    <div className='w-full flex flex-col justify-center'>
      {isLoadingProjectFlock && (
        <span className='loading loading-spinner loading-xl' />
      )}
@@ -1,12 +1,13 @@
 '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';
 import useSWR from 'swr';

-const ProjectFlockDetail = () => {
+const ProjectFlockDetailPage = () => {
  const router = useRouter();
  const searchParams = useSearchParams();

@@ -37,19 +38,17 @@ const ProjectFlockDetail = () => {
  }

  return (
-    <div className='w-full p-4 flex flex-col justify-center'>
+    <div className='w-full h-full flex flex-col justify-center'>
      {isLoadingProjectFlock && (
        <span className='loading loading-spinner loading-xl' />
      )}
      {isResponseSuccess(projectFlock) && (
-        <ProjectFlockForm
-          formType='detail'
-          initialValues={projectFlock.data}
-          refreshProjectFlocks={refreshProjectFlock}
-        />
+        <ProjectFlockDetail projectFlock={projectFlock.data} />
      )}
    </div>
  );
 };

-export default ProjectFlockDetail;
+export default ProjectFlockDetailPage;
+ProjectFlockDetail;
+ProjectFlockDetail;
@@ -0,0 +1,60 @@
+'use client';
+
+import { usePathname, useRouter } from 'next/navigation';
+import Drawer from '@/components/Drawer';
+import React, { ReactNode } from 'react';
+import ProjectFlockTable from '@/components/pages/production/project-flock/ProjectFlockTable';
+import { useUiStore } from '@/stores/ui/ui.store';
+
+export default function ProjectFlockLayout({
+  children,
+}: {
+  children: ReactNode;
+}) {
+  const pathname = usePathname();
+  const router = useRouter();
+  const toggleValidate = useUiStore((s) => s.toggleValidate);
+
+  const isAdd = pathname.endsWith('/add');
+  const isEdit = pathname.includes('/detail/edit');
+  const isDetail = pathname.includes('/detail');
+  const isChickin = pathname.includes('/chickin/add/kandang');
+  const isClosing = pathname.includes('/closing');
+
+  const isOpen = isAdd || isEdit || isDetail || isChickin || isClosing;
+
+  const handleBackdropClick = () => {
+    const unsub = useUiStore.getState().subscribeIsValid((isValid) => {
+      if (isValid) {
+        unsub(); // berhenti listen
+        router.push('/production/project-flock');
+      }
+    });
+
+    toggleValidate();
+  };
+
+  return (
+    <>
+      {/* List page always rendered */}
+      <div className='min-h-sceen w-full relative'>
+        <ProjectFlockTable
+          refresh={() => !isOpen && router.push('/production/project-flock')}
+        />
+      </div>
+
+      {/* Render Drawer only on /add */}
+      <Drawer
+        open={isOpen}
+        setOpen={(v) => {
+          if (!v) router.push('/production/project-flock');
+        }}
+        closeOnBackdropClick={isDetail ? true : false}
+        onBackdropClick={handleBackdropClick}
+        variant='right'
+        zIndex='99999'
+        sidebarContent={isOpen && <div className=''>{children}</div>}
+      />
+    </>
+  );
+}
@@ -2,7 +2,7 @@ import ProjectFlockTable from '@/components/pages/production/project-flock/Proje

 const ProjectFlock = () => {
  return (
-    <section className='w-full p-4'>
+    <section className='size-full p-4'>
      <ProjectFlockTable />
    </section>
  );
@@ -1,49 +0,0 @@
-'use client';
-
-import { useRouter, useSearchParams } from 'next/navigation';
-import useSWR from 'swr';
-import GradingForm from '@/components/pages/production/recording/grading/form/GradingForm';
-import { RecordingApi } from '@/services/api/production';
-import { isResponseSuccess } from '@/lib/api-helper';
-
-const AddGrading = () => {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-
-  const recordingId = searchParams.get('recording_id');
-
-  const { data: recording, isLoading: isLoadingRecording } = useSWR(
-    recordingId && recordingId !== 'new' ? [recordingId] : null,
-    ([id]) => RecordingApi.getSingle(parseInt(id))
-  );
-
-  if (
-    recordingId &&
-    recordingId !== 'new' &&
-    !isLoadingRecording &&
-    (!recording || !isResponseSuccess(recording))
-  ) {
-    router.replace('/404');
-    return;
-  }
-
-  return (
-    <div className='w-full p-4 flex flex-row justify-center'>
-      {recordingId && recordingId !== 'new' && isLoadingRecording && (
-        <span className='loading loading-spinner loading-xl' />
-      )}
-      {(!recordingId ||
-        recordingId === 'new' ||
-        (!isLoadingRecording && recording && isResponseSuccess(recording))) && (
-        <GradingForm
-          type='add'
-          initialValues={
-            isResponseSuccess(recording) ? recording.data?.eggs?.[0] : undefined
-          }
-        />
-      )}
-    </div>
-  );
-};
-
-export default AddGrading;
@@ -1,53 +0,0 @@
-'use client';
-
-import { useRouter, useSearchParams } from 'next/navigation';
-import useSWR from 'swr';
-import GradingForm from '@/components/pages/production/recording/grading/form/GradingForm';
-import { RecordingApi } from '@/services/api/production';
-import { isResponseSuccess } from '@/lib/api-helper';
-
-const EditGrading = () => {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-
-  const recordingId = searchParams.get('recordingId');
-  const gradingId = searchParams.get('gradingId');
-
-  const { data: recording, isLoading: isLoadingRecording } = useSWR(
-    recordingId ? [recordingId] : null,
-    ([id]) => RecordingApi.getSingle(parseInt(id))
-  );
-
-  if (!recordingId) {
-    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 (!isLoadingRecording && (!recording || !isResponseSuccess(recording))) {
-    router.replace('/404');
-    return;
-  }
-
-  return (
-    <div className='w-full p-4 flex flex-row justify-center'>
-      {isLoadingRecording && (
-        <span className='loading loading-spinner loading-xl' />
-      )}
-      {!isLoadingRecording && recording && isResponseSuccess(recording) && (
-        <GradingForm
-          type='edit'
-          initialValues={recording.data.eggs?.find(
-            (egg) => egg.id === parseInt(gradingId || '0')
-          )}
-        />
-      )}
-    </div>
-  );
-};
-
-export default EditGrading;
@@ -1,52 +0,0 @@
-'use client';
-
-import { useRouter, useSearchParams } from 'next/navigation';
-import useSWR from 'swr';
-import GradingForm from '@/components/pages/production/recording/grading/form/GradingForm';
-import { RecordingApi } from '@/services/api/production';
-import { isResponseSuccess } from '@/lib/api-helper';
-
-const DetailGrading = () => {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-
-  const gradingId = searchParams.get('gradingId');
-
-  const { data: grading, isLoading: isLoadingGrading } = useSWR(
-    gradingId ? [gradingId] : null,
-    ([id]) => RecordingApi.getSingle(parseInt(id))
-  );
-
-  if (!gradingId) {
-    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 (!isLoadingGrading && (!grading || !isResponseSuccess(grading))) {
-    router.replace('/404');
-    return;
-  }
-
-  return (
-    <div className='w-full p-4 flex flex-row justify-center'>
-      {isLoadingGrading && (
-        <span className='loading loading-spinner loading-xl' />
-      )}
-      {!isLoadingGrading && grading && isResponseSuccess(grading) && (
-        <GradingForm
-          type='detail'
-          initialValues={grading.data.eggs?.find(
-            (egg) => egg.id === parseInt(gradingId)
-          )}
-        />
-      )}
-    </div>
-  );
-};
-
-export default DetailGrading;
@@ -10,28 +10,102 @@ interface DrawerProps {
  open: boolean;
  setOpen: (newOpenState: boolean) => void;
  openOnLarge?: boolean;
+  variant?: 'sidebar' | 'left' | 'right';
+  zIndex?: string;
+  className?: DrawerClassName;
+  onBackdropClick?: () => void;
+  closeOnBackdropClick?: boolean;
 }

+type DrawerClassName = {
+  drawer?: string;
+  drawerContent?: string;
+  drawerSide?: string;
+  drawerOverlay?: string;
+  drawerSidebarContent?: string;
+};
+
 const Drawer = ({
  children,
  sidebarContent,
  open,
  setOpen,
  openOnLarge,
+  variant = 'sidebar',
+  zIndex = '20',
+  className,
+  onBackdropClick,
+  closeOnBackdropClick = true,
 }: DrawerProps) => {
+  const getDrawerClassNames = (): DrawerClassName => {
+    const baseClassNames = {
+      drawer: 'drawer',
+      drawerContent: 'drawer-content',
+      drawerSide: 'drawer-side',
+      drawerOverlay: 'drawer-overlay',
+      drawerSidebarContent: 'min-h-full bg-base-100',
+    };
+
+    if (variant === 'sidebar') {
+      return {
+        ...baseClassNames,
+        drawerSidebarContent: cn(
+          baseClassNames.drawerSidebarContent,
+          'w-full max-w-[300px] lg:w-[300px]'
+        ),
+      };
+    } else if (variant === 'right') {
+      return {
+        ...baseClassNames,
+        drawer: cn(baseClassNames.drawer, 'drawer-end'),
+        drawerSide: cn(
+          baseClassNames.drawerSide,
+          'border-l border-solid border-gray-200 drawer-side w-screen top-0 right-0 fixed z-21'
+        ),
+        drawerSidebarContent: cn(
+          baseClassNames.drawerSidebarContent,
+          'w-full min-w-120 sm:w-fit'
+        ),
+      };
+    } else if (variant === 'left') {
+      return {
+        ...baseClassNames,
+        drawerSide: cn(
+          baseClassNames.drawerSide,
+          'border-l border-solid border-gray-200 drawer-side w-screen top-0 right-0 fixed z-21'
+        ),
+        drawerSidebarContent: cn(
+          baseClassNames.drawerSidebarContent,
+          'w-full min-w-120 sm:w-fit'
+        ),
+      };
+    }
+    return baseClassNames; // Fallback for default or unknown variant
+  };
+
+  const varianClassName = getDrawerClassNames();
+
  const toggleDrawer = () => {
    setOpen(!open);
  };

  const closeDrawer = () => {
+    if (closeOnBackdropClick) {
      setOpen(false);
+    }
+    onBackdropClick && onBackdropClick();
  };

  return (
    <div
-      className={cn('drawer', {
+      className={cn(
+        'drawer',
+        {
          'lg:drawer-open': openOnLarge,
-      })}
+        },
+        varianClassName?.drawer,
+        className?.drawer
+      )}
    >
      <input
        type='checkbox'
@@ -40,16 +114,37 @@ const Drawer = ({
        className='drawer-toggle'
      />

-      <div className='drawer-content'>{children}</div>
+      {/* Drawer Content */}
+      <div
+        className={cn(varianClassName?.drawerContent, className?.drawerContent)}
+      >
+        {children}
+      </div>

-      <div className='drawer-side border-r border-solid border-gray-200 z-20'>
+      {/* Drawer Side */}
+      <div
+        className={cn(
+          varianClassName?.drawerSide,
+          className?.drawerSide,
+          zIndex
+        )}
+      >
        <label
          aria-label='close sidebar'
-          className='drawer-overlay'
+          className={cn(
+            varianClassName?.drawerOverlay,
+            className?.drawerOverlay
+          )}
          onClick={closeDrawer}
        />

-        <div className='min-h-full w-full max-w-[300px] lg:w-[300px] bg-base-100'>
+        {/* Sidebar Content */}
+        <div
+          className={cn(
+            varianClassName?.drawerSidebarContent,
+            className?.drawerContent
+          )}
+        >
          {sidebarContent}
        </div>
      </div>
@@ -0,0 +1,141 @@
+'use client';
+
+import Button from '@/components/Button';
+import Tooltip from '@/components/Tooltip';
+import { cn } from '@/lib/helper';
+import { Icon } from '@iconify/react';
+
+type FloatingActionsButtonProps = {
+  actions: {
+    action: 'DETAIL' | 'EDIT' | 'DELETE';
+    icon: string;
+    label?: string;
+    onClick?: () => void;
+    hidden?: boolean;
+    disabled?: boolean;
+  }[];
+  approvals: {
+    action: 'APPROVED' | 'REJECTED';
+    icon: string;
+    label?: string;
+    onClick?: () => void;
+    disabled?: boolean;
+  }[];
+  selectedRowIds: number[];
+  onClose: () => void;
+};
+
+const FloatingActionsButton = ({
+  actions,
+  approvals,
+  selectedRowIds,
+  onClose,
+}: FloatingActionsButtonProps) => {
+  // Jika tidak ada baris yang dipilih, jangan tampilkan FAB
+  const positionStyles =
+    selectedRowIds.length > 0 ? 'bottom-[10%]' : 'bottom-[-100%]';
+
+  // Helper untuk menentukan gaya warna tombol approval
+  const getApprovalColor = (action: 'APPROVED' | 'REJECTED') => {
+    if (action === 'APPROVED') return 'success';
+    if (action === 'REJECTED') return 'error';
+    return 'primary';
+  };
+
+  const getActionColor = (action: 'DETAIL' | 'EDIT' | 'DELETE') => {
+    if (action === 'DETAIL') return 'white';
+    if (action === 'EDIT') return 'warning';
+    if (action === 'DELETE') return 'error';
+    return 'primary';
+  };
+
+  return (
+    // Container utama FAB
+    <div
+      className={cn(
+        `absolute ${positionStyles} inset-x-1/2 -translate-x-1/2 z-50`,
+        'mx-auto w-full max-w-sm sm:mx-0 bg-base-300 p-4 rounded-xl shadow-md transition-all duration-300 transform',
+        'bg-slate-950 backdrop-blur-md'
+      )}
+    >
+      <div className='flex flex-col gap-3'>
+        {/* === BARIS ATAS: Status Seleksi dan Actions (Termasuk Close) === */}
+        <div className='flex justify-between items-center text-white'>
+          <h4 className='text-base font-semibold'>
+            {selectedRowIds.length} Selected
+          </h4>
+
+          <div className='flex flex-row gap-1 items-stretch'>
+            <div className='flex gap-4 items-center'>
+              {/* Render Aksi dari props.actions */}
+              {actions
+                .filter((action) => !action.hidden)
+                .map((action, index) => {
+                  return (
+                    <Button
+                      key={index}
+                      onClick={action.onClick}
+                      className='text-white hover:text-gray-400 tooltip tooltip-bottom p-0'
+                      variant='link'
+                      disabled={action.disabled}
+                    >
+                      <Tooltip content={action.label || action.action}>
+                        <Icon
+                          icon={action.icon}
+                          width={20}
+                          height={20}
+                          className={`text-${getActionColor(action.action)} font-thin`}
+                        />
+                      </Tooltip>
+                    </Button>
+                  );
+                })}
+
+              <div className='border-[0.5px] border-white/30 h-full'></div>
+
+              {/* Tombol Close */}
+              <Button
+                onClick={onClose}
+                className='text-white hover:text-gray-400 p-0'
+                variant='link'
+              >
+                <Tooltip content='Close'>
+                  <Icon icon='mdi:close' width={20} height={20} />
+                </Tooltip>
+              </Button>
+            </div>
+          </div>
+        </div>
+
+        {/* === BARIS BAWAH: Approval Buttons (Approve/Reject) === */}
+        <div className={`grid grid-cols-${approvals.length} gap-3`}>
+          {approvals.map((approval, index) => (
+            <Button
+              key={index}
+              onClick={approval.onClick}
+              className={cn(
+                'btn btn-lg w-full',
+                'bg-white/20 border-white/30',
+                'text-white/50 font-semibold flex items-center gap-2 rounded-lg transition-all duration-200',
+                approval.disabled
+                  ? 'cursor-not-allowed'
+                  : 'hover:text-white/100 hover:bg-white/40 hover:border-white/50'
+              )}
+              disabled={approval.disabled}
+            >
+              <Icon
+                icon={approval.icon}
+                width={20}
+                height={20}
+                className={`text-${getApprovalColor(approval.action)}`}
+              />
+              {approval.label || approval.action}
+            </Button>
+          ))}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default FloatingActionsButton;
@@ -1,161 +1,21 @@
 'use client';

-import { useCallback, useState } from 'react';
+import { useCallback } from 'react';
 import { usePathname } from 'next/navigation';

 import Image from 'next/image';
 import { Icon } from '@iconify/react';
 import Drawer from '@/components/Drawer';
-import Menu from '@/components/menu/Menu';
-import MenuItem from '@/components/menu/MenuItem';
 import Navbar from '@/components/Navbar';
-import Collapse from '@/components/Collapse';
 import Button from '@/components/Button';
+import SidebarMenu from '@/components/molecules/SidebarMenu';

 import { useUiStore } from '@/stores/ui/ui.store';
 import { MAIN_DRAWER_LINKS } from '@/config/constant';
-import { cn } from '@/lib/helper';
-
-type CollapseMenuProps = {
-  title: string;
-  link: string;
-  icon: string;
-  submenu?: CollapseMenuProps[];
-  depth?: number;
-};
-
-const isPathActive = (pathname: string, link?: string) => {
-  if (!link) return false;
-
-  const splittedPathname = pathname.split('/');
-  const splittedLink = link.split('/');
-
-  const isActiveLinkValid = splittedLink.every((linkChunk, idx) => {
-    return linkChunk === splittedPathname[idx];
-  });
-
-  return pathname.startsWith(link) && isActiveLinkValid;
-};
-
-const CollapseMenu = ({
-  title,
-  link,
-  icon,
-  submenu,
-  depth = 0,
-}: CollapseMenuProps) => {
-  const pathname = usePathname();
-  const isActive = isPathActive(pathname, link);
-  const [open, setOpen] = useState(isActive);
-
-  const menuCollapseTitle = (
-    <div
-      className={cn(
-        'w-full px-3 py-2 rounded-md text-base font-semibold transition-colors flex flex-row justify-between items-center gap-2 hover:bg-primary/10 opacity-40',
-        {
-          'bg-primary/10 opacity-100': open || isActive,
-        }
-      )}
-    >
-      <div className='flex flex-row items-center gap-2'>
-        <Icon icon={icon} width={20} height={20} />
-        <span>{title}</span>
-      </div>
-
-      <Icon
-        icon='cuida:caret-up-outline'
-        width={20}
-        height={20}
-        className={cn('transition-transform', {
-          'rotate-90': !open,
-          'rotate-180': open,
-        })}
-      />
-    </div>
-  );
-
-  return (
-    <Collapse
-      open={open}
-      title={menuCollapseTitle}
-      onOpenChange={setOpen}
-      className='w-full'
-      titleClassName='w-full p-0!'
-    >
-      <Menu>
-        <div
-          className='w-full py-0.5 flex flex-col gap-0.5'
-          style={{
-            paddingLeft: `${0.5 * (depth + 1)}rem`,
-          }}
-        >
-          {submenu?.map((item, idx) => {
-            const hasSubmenu = item.submenu && item.submenu.length > 0;
-
-            if (!hasSubmenu) {
-              return (
-                <MenuItem
-                  key={idx}
-                  title={item.title}
-                  href={item.link}
-                  icon={item.icon}
-                  active={isPathActive(pathname, item.link)}
-                />
-              );
-            }
-
-            return (
-              <CollapseMenu
-                key={idx}
-                title={item.title}
-                link={item.link}
-                icon={item.icon}
-                submenu={item.submenu}
-                depth={depth + 1}
-              />
-            );
-          })}
-        </div>
-      </Menu>
-    </Collapse>
-  );
-};
-
-const MainDrawerMenu = () => {
-  const pathname = usePathname();
-
-  return (
-    <Menu>
-      {MAIN_DRAWER_LINKS.map((item, idx) => {
-        const hasSubmenu = item.submenu && item.submenu.length > 0;
-
-        if (!hasSubmenu) {
-          return (
-            <MenuItem
-              key={idx}
-              title={item.title}
-              href={item.link}
-              icon={item.icon}
-              active={pathname.startsWith(item.link)}
-            />
-          );
-        }
-
-        return (
-          <CollapseMenu
-            key={idx}
-            title={item.title}
-            link={item.link}
-            icon={item.icon}
-            submenu={item.submenu}
-          />
-        );
-      })}
-    </Menu>
-  );
-};
+import { isPathActive } from '@/lib/helper';

 const MainDrawerContent = () => {
+  const pathname = usePathname();
  const { setMainDrawerOpen } = useUiStore();

  const closeMainDrawerHandler = () => {
@@ -191,7 +51,7 @@ const MainDrawerContent = () => {
        </div>
      </div>

-      <MainDrawerMenu />
+      <SidebarMenu menu={MAIN_DRAWER_LINKS} activeLink={pathname} />
    </div>
  );
 };
@@ -216,9 +76,9 @@ const MainDrawer = ({
      const hasSubmenu = menu?.submenu && menu?.submenu.length > 0;

      if (!title) {
-        title += menu?.title;
+        title += menu?.text;
      } else {
-        title += ' - ' + menu?.title;
+        title += ' - ' + menu?.text;
      }

      if (!hasSubmenu || !menu.submenu) return;
@@ -7,6 +7,7 @@ import { Icon } from '@iconify/react';
 import Menu from '@/components/menu/Menu';
 import MenuItem from '@/components/menu/MenuItem';
 import Button from '@/components/Button';
+import Dropdown from '@/components/dropdown/Dropdown';

 import { useAuth } from '@/services/hooks/useAuth';
 import { AuthApi } from '@/services/api/auth';
@@ -52,21 +53,21 @@ const Navbar = ({ title, toggleSidebar }: NavbarProps) => {
      </div>

      <div className='flex gap-2'>
-        <div className='dropdown dropdown-end'>
-          <div
-            tabIndex={0}
-            role='button'
-            className='btn btn-ghost btn-circle avatar'
-          >
-            <div className='w-10 rounded-full border grid place-items-center'>
+        <Dropdown
+          position='bottom-end'
+          trigger={
+            <div className='btn btn-ghost btn-circle avatar'>
+              <div className='w-10 rounded-full border flex justify-center items-center'>
                <Icon icon='uil:user' width={40} height={40} />
              </div>
            </div>
-
-          <Menu className='dropdown-content w-52 mt-3 p-2 bg-base-100 shadow rounded-box menu-sm'>
+          }
+          contentClassName='w-52 mt-3'
+        >
+          <Menu className='p-2 bg-base-100 shadow rounded-box menu-sm'>
            <MenuItem title='Logout' onClick={logoutClickHandler} />
          </Menu>
-        </div>
+        </Dropdown>
      </div>
    </div>
  );
@@ -0,0 +1,116 @@
+'use client';
+
+import { ReactNode, useRef, useEffect, useState } from 'react';
+import { cn } from '@/lib/helper';
+
+interface DropdownProps {
+  trigger: ReactNode;
+  children: ReactNode;
+  position?:
+    | 'top'
+    | 'bottom'
+    | 'left'
+    | 'right'
+    | 'top-start'
+    | 'top-end'
+    | 'bottom-start'
+    | 'bottom-end'
+    | 'left-start'
+    | 'left-end'
+    | 'right-start'
+    | 'right-end';
+  align?: 'start' | 'center' | 'end';
+  hover?: boolean;
+  className?: string;
+  contentClassName?: string;
+}
+
+const Dropdown = ({
+  trigger,
+  children,
+  position = 'bottom',
+  align = 'start',
+  hover = false,
+  className,
+  contentClassName,
+}: DropdownProps) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const dropdownRef = useRef<HTMLDivElement>(null);
+
+  // Handle click outside to close dropdown
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (
+        dropdownRef.current &&
+        !dropdownRef.current.contains(event.target as Node)
+      ) {
+        setIsOpen(false);
+      }
+    };
+
+    if (isOpen) {
+      document.addEventListener('mousedown', handleClickOutside);
+    }
+
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, [isOpen]);
+
+  // Build position classes
+  const getPositionClasses = () => {
+    const classes: string[] = [];
+
+    // Handle combined positions like 'top-start'
+    if (position.includes('-')) {
+      const [pos, al] = position.split('-');
+      classes.push(`dropdown-${pos}`);
+      classes.push(`dropdown-${al}`);
+    } else {
+      classes.push(`dropdown-${position}`);
+      if (align !== 'start') {
+        classes.push(`dropdown-${align}`);
+      }
+    }
+
+    return classes.join(' ');
+  };
+
+  const handleToggle = (e: React.MouseEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    // alert('clicked');
+    setIsOpen(!isOpen);
+  };
+
+  return (
+    <div
+      ref={dropdownRef}
+      className={cn(
+        'dropdown',
+        getPositionClasses(),
+        hover && 'dropdown-hover',
+        isOpen && 'dropdown-open',
+        className
+      )}
+    >
+      {/* Trigger Button */}
+      <div onClick={handleToggle} className='cursor-pointer'>
+        {trigger}
+      </div>
+
+      {/* Dropdown Content - Only render when open */}
+      {isOpen && (
+        <div
+          tabIndex={-1}
+          className={cn('dropdown-content z-[10]', contentClassName)}
+          onClick={() => setIsOpen(false)} // Close on item click
+        >
+          {children}
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default Dropdown;
@@ -1,56 +1,61 @@
 'use client';

 import { ReactNode, useEffect } from 'react';
-import { useRouter } from 'next/navigation';
-import useSWRImmutable from 'swr/immutable';
+import useSWR from 'swr';

 import { useAuth } from '@/services/hooks/useAuth';
 import { httpClientFetcher, SWRHttpKey } from '@/services/http/client';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { BaseApiResponse, GetMeResponse } from '@/types/api/api-general';
 import { AxiosError } from 'axios';
+import { redirectToSSO } from '@/lib/auth-helper';

 interface RequireAuthProps {
  children?: ReactNode;
 }

 const RequireAuth = ({ children }: RequireAuthProps) => {
-  const router = useRouter();
-  const { setUser, setIsLoadingUser } = useAuth();
+  const { user, setUser, setIsLoadingUser } = useAuth();

  const {
    data: userResponse,
    isLoading: isLoadingUserResponse,
    error: userErrorResponse,
-  } = useSWRImmutable<
+  } = useSWR<
    GetMeResponse & { ok?: boolean },
    AxiosError<BaseApiResponse>,
    SWRHttpKey
  >('/sso/userinfo', httpClientFetcher, {
    shouldRetryOnError: false,
-    revalidateOnFocus: false,
-    revalidateOnReconnect: false,
-    refreshInterval: 0,
  });

-  useEffect(() => {
-    setIsLoadingUser(isLoadingUserResponse);
-  }, [isLoadingUserResponse, setIsLoadingUser]);
-
  useEffect(() => {
    if (isResponseSuccess(userResponse)) {
      setUser(userResponse.data);
-    } else if (
-      isResponseError(userErrorResponse?.response?.data) &&
-      typeof window !== 'undefined'
-    ) {
-      router.replace(
-        `${process.env.NEXT_PUBLIC_SSO_LOGIN_URL as string}?redirect_url=${window.location.href}`
-      );
    }
-  }, [userResponse, userErrorResponse, setIsLoadingUser, setUser]);
+  }, [userResponse, setUser]);

-  if (isLoadingUserResponse && !userResponse && !userErrorResponse) {
+  // Explicitly handle 401 redirect from the component level
+  useEffect(() => {
+    if (
+      isResponseError(userResponse) &&
+      userErrorResponse?.response?.status === 401
+    ) {
+      // Clear cache to prevent stale data from rendering children
+      // mutate('/sso/userinfo', undefined, { revalidate: false }); // Optional: if using global mutate
+      setUser(undefined);
+      redirectToSSO();
+    }
+  }, [userErrorResponse, setUser, userResponse]);
+
+  useEffect(() => {
+    setIsLoadingUser(isLoadingUserResponse);
+  }, [isLoadingUserResponse]);
+
+  if (
+    (isLoadingUserResponse && !userResponse && !userErrorResponse) ||
+    (!userResponse && !userErrorResponse)
+  ) {
    return (
      <div className='w-full flex flex-row justify-center items-center p-4'>
        <span className='loading loading-spinner loading-xl' />
@@ -58,7 +63,25 @@ const RequireAuth = ({ children }: RequireAuthProps) => {
    );
  }

-  return <>{isResponseSuccess(userResponse) && children}</>;
+  if (userErrorResponse) {
+    return (
+      <div className='w-full h-screen flex flex-col justify-center items-center gap-4'>
+        <h2 className='text-2xl font-bold text-error'>Authentication Failed</h2>
+        <p className='text-gray-600'>
+          Please try refreshing the page or contact support if the problem
+          persists.
+        </p>
+        <button
+          className='btn btn-primary'
+          onClick={() => window.location.reload()}
+        >
+          Retry
+        </button>
+      </div>
+    );
+  }
+
+  return <>{isResponseSuccess(userResponse) && user && children}</>;
 };

 export default RequireAuth;
@@ -0,0 +1,104 @@
+'use client';
+
+import { Icon } from '@iconify/react';
+import Link from 'next/link';
+import { ReactNode } from 'react';
+import { cn } from '@/lib/helper';
+
+export interface DrawerHeaderProps {
+  // Left side props
+  leftIcon?: string;
+  leftIconSize?: number;
+  leftIconHref?: string;
+  leftIconOnClick?: () => void;
+  leftIconClassName?: string;
+
+  // Subtitle/label props
+  subtitle?: string | ReactNode;
+  subtitleClassName?: string;
+
+  // Right side actions (children)
+  children?: ReactNode;
+
+  // Container props
+  className?: string;
+  showDivider?: boolean;
+}
+
+const DrawerHeader = ({
+  leftIcon = 'mdi:close',
+  leftIconSize = 24,
+  leftIconHref,
+  leftIconOnClick,
+  leftIconClassName,
+  subtitle,
+  subtitleClassName,
+  children,
+  className,
+  showDivider = true,
+}: DrawerHeaderProps) => {
+  const renderLeftIcon = () => {
+    const iconElement = (
+      <Icon
+        icon={leftIcon}
+        width={leftIconSize}
+        height={leftIconSize}
+        className={cn('cursor-pointer', leftIconClassName)}
+      />
+    );
+
+    if (leftIconHref) {
+      return (
+        <Link href={leftIconHref} className='hover:text-gray-400'>
+          {iconElement}
+        </Link>
+      );
+    }
+
+    if (leftIconOnClick) {
+      return (
+        <button
+          onClick={leftIconOnClick}
+          className='hover:text-gray-400 bg-transparent border-none p-0'
+        >
+          {iconElement}
+        </button>
+      );
+    }
+
+    return iconElement;
+  };
+
+  return (
+    <div
+      className={cn(
+        'flex flex-row justify-between items-center px-4 pt-4',
+        className
+      )}
+    >
+      {/* Left Side */}
+      <div className='flex flex-row h-full gap-2 items-center'>
+        {renderLeftIcon()}
+
+        {showDivider && subtitle && (
+          <div className='divider divider-horizontal p-0 m-0'></div>
+        )}
+
+        {subtitle && (
+          <div className={cn('text-sm text-neutral', subtitleClassName)}>
+            {subtitle}
+          </div>
+        )}
+      </div>
+
+      {/* Right Side Actions */}
+      {children && (
+        <div className='flex flex-row gap-3 justify-end items-center'>
+          {children}
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default DrawerHeader;
@@ -2,8 +2,9 @@

 import { HTMLProps, useEffect, useRef } from 'react';
 import { cn } from '@/lib/helper';
+import { Size } from '@/types/theme';

-interface CheckboxInputProps extends HTMLProps<HTMLInputElement> {
+interface CheckboxInputProps extends Omit<HTMLProps<HTMLInputElement>, 'size'> {
  name: string;
  label?: string;
  indeterminate?: boolean;
@@ -16,6 +17,7 @@ interface CheckboxInputProps extends HTMLProps<HTMLInputElement> {
  isError?: boolean;
  isValid?: boolean;
  errorMessage?: string;
+  size?: Size;
 }

 const CheckboxInput = ({
@@ -27,10 +29,19 @@ const CheckboxInput = ({
  isValid,
  isError,
  errorMessage,
+  size = 'sm',
  ...rest
 }: CheckboxInputProps) => {
  const ref = useRef<HTMLInputElement>(null!);

+  const checkboxBaseClassName = cn('checkbox cursor-pointer rounded-md', {
+    'checkbox-xs': size === 'xs',
+    'checkbox-sm': size === 'sm',
+    'checkbox-md': size === 'md',
+    'checkbox-lg': size === 'lg',
+    'checkbox-xl': size === 'xl',
+  });
+
  useEffect(() => {
    if (typeof indeterminate === 'boolean') {
      ref.current.indeterminate = !rest.checked && indeterminate;
@@ -53,7 +64,7 @@ const CheckboxInput = ({
          id={name}
          name={name}
          className={cn(
-            'checkbox cursor-pointer',
+            checkboxBaseClassName,
            {
              'border-error': isError,
              'border-success': isValid,
@@ -7,11 +7,11 @@ import {
  useState,
 } from 'react';
 import { cn, formatDate } from '@/lib/helper';
-import Modal, { useModal } from '../Modal';
 import { DateRange, DayPicker, Matcher } from 'react-day-picker';
 import 'react-day-picker/dist/style.css';
-import Button from '../Button';
 import { Icon } from '@iconify/react';
+import Modal, { useModal } from '@/components/Modal';
+import Button from '@/components/Button';

 export interface DateInputProps {
  label?: string;
@@ -1,6 +1,11 @@
 'use client';

-import { ChangeEventHandler, ReactNode } from 'react';
+import {
+  ChangeEventHandler,
+  ReactNode,
+  createContext,
+  useContext,
+} from 'react';
 import { cn } from '@/lib/helper';

 export interface RadioOption {
@@ -8,37 +13,74 @@ export interface RadioOption {
  value: string;
 }

-export interface RadioInputProps {
-  label?: string;
-  bottomLabel?: string;
+// DaisyUI Radio Colors
+export type RadioColor =
+  | 'neutral'
+  | 'primary'
+  | 'secondary'
+  | 'accent'
+  | 'success'
+  | 'warning'
+  | 'info'
+  | 'error';
+
+// DaisyUI Radio Sizes
+export type RadioSize = 'xs' | 'sm' | 'md' | 'lg' | 'xl';
+
+// Context untuk RadioGroup
+interface RadioGroupContextValue {
  name: string;
  value?: string;
-  options: RadioOption[];
-  variant?: string;
-  className?: {
-    wrapper?: string;
-    label?: string;
-    radioWrapper?: string;
-    radio?: string;
-  };
-  isError?: boolean;
-  isValid?: boolean;
-  errorMessage?: string;
-  required?: boolean;
+  color?: RadioColor;
+  size?: RadioSize;
  disabled?: boolean;
-  startAdornment?: ReactNode;
-  endAdornment?: ReactNode;
  onChange?: ChangeEventHandler<HTMLInputElement>;
  onBlur?: (e: React.FocusEvent<HTMLInputElement>) => void;
 }

-const RadioInput = ({
+const RadioGroupContext = createContext<RadioGroupContextValue | undefined>(
+  undefined
+);
+
+const useRadioGroup = () => {
+  const context = useContext(RadioGroupContext);
+  if (!context) {
+    throw new Error('RadioGroupItem must be used within RadioGroup');
+  }
+  return context;
+};
+
+// RadioGroup Component
+export interface RadioGroupProps {
+  label?: string;
+  bottomLabel?: string;
+  name: string;
+  value?: string;
+  options?: RadioOption[];
+  color?: RadioColor;
+  size?: RadioSize;
+  className?: {
+    wrapper?: string;
+    label?: string;
+    radioWrapper?: string;
+  };
+  isError?: boolean;
+  errorMessage?: string;
+  required?: boolean;
+  disabled?: boolean;
+  onChange?: ChangeEventHandler<HTMLInputElement>;
+  onBlur?: (e: React.FocusEvent<HTMLInputElement>) => void;
+  children?: ReactNode;
+}
+
+export const RadioGroup = ({
  label,
  bottomLabel,
  name,
  value,
  options,
-  variant = 'radio-primary',
+  color = 'primary',
+  size = 'md',
  className,
  isError,
  errorMessage,
@@ -46,8 +88,20 @@ const RadioInput = ({
  disabled = false,
  onChange,
  onBlur,
-}: RadioInputProps) => {
+  children,
+}: RadioGroupProps) => {
+  const contextValue: RadioGroupContextValue = {
+    name,
+    value,
+    color,
+    size,
+    disabled,
+    onChange,
+    onBlur,
+  };
+
  return (
+    <RadioGroupContext.Provider value={contextValue}>
      <div className={cn('w-full flex flex-col gap-2', className?.wrapper)}>
        {/* Label atas */}
        {label && (
@@ -74,27 +128,18 @@ const RadioInput = ({
            className?.radioWrapper
          )}
        >
-        {options.map((option) => (
-          <label
+          {/* Jika options diberikan, render otomatis */}
+          {options &&
+            options.map((option) => (
+              <RadioGroupItem
                key={option.value}
-            className={cn(
-              'flex flex-row items-center gap-2 cursor-pointer',
-              disabled && 'opacity-60 cursor-not-allowed'
-            )}
-          >
-            <input
-              type='radio'
-              name={name}
                value={option.value}
-              checked={value === option.value}
-              onChange={onChange}
-              onBlur={onBlur}
-              disabled={disabled}
-              className={cn('radio', variant, className?.radio)}
+                label={option.label}
              />
-            <span className='text-sm'>{option.label}</span>
-          </label>
            ))}
+
+          {/* Atau gunakan children untuk custom rendering */}
+          {children}
        </div>

        {/* Label bawah */}
@@ -107,7 +152,61 @@ const RadioInput = ({
          <p className='text-sm text-error'>{errorMessage}</p>
        )}
      </div>
+    </RadioGroupContext.Provider>
  );
 };

-export default RadioInput;
+// RadioGroupItem Component
+export interface RadioGroupItemProps {
+  value: string;
+  label?: string;
+  className?: string;
+  disabled?: boolean;
+  color?: RadioColor;
+  size?: RadioSize;
+}
+
+export const RadioGroupItem = ({
+  value,
+  label,
+  className,
+  disabled: itemDisabled,
+  color: itemColor,
+  size: itemSize,
+}: RadioGroupItemProps) => {
+  const {
+    name,
+    value: groupValue,
+    color: groupColor,
+    size: groupSize,
+    disabled: groupDisabled,
+    onChange,
+    onBlur,
+  } = useRadioGroup();
+
+  const isDisabled = itemDisabled ?? groupDisabled;
+  const radioColor = itemColor ?? groupColor;
+  const radioSize = itemSize ?? groupSize;
+
+  return (
+    <label
+      className={cn(
+        'flex flex-row items-center gap-2 cursor-pointer',
+        isDisabled && 'opacity-60 cursor-not-allowed',
+        className
+      )}
+    >
+      <input
+        type='radio'
+        name={name}
+        value={value}
+        checked={groupValue === value}
+        onChange={onChange}
+        onBlur={onBlur}
+        disabled={isDisabled}
+        className={cn('radio', `radio-${radioColor}`, `radio-${radioSize}`)}
+      />
+      {label && <span className='text-sm'>{label}</span>}
+    </label>
+  );
+};
@@ -1,16 +1,32 @@
 import { ReactNode } from 'react';

 import { cn } from '@/lib/helper';
+import { Size } from '@/types/theme';

 interface MenuProps {
  children?: ReactNode;
+  size?: Size;
+  direction?: 'vertical' | 'horizontal';
  className?: string;
 }

-const Menu = ({ children, className }: MenuProps) => {
-  return (
-    <ul className={cn('menu w-full p-0 gap-0.5', className)}>{children}</ul>
-  );
+const Menu = ({
+  children,
+  size = 'md',
+  direction = 'vertical',
+  className,
+}: MenuProps) => {
+  const menuBaseClassName = cn('menu w-full', {
+    'menu-xs': size === 'xs',
+    'menu-sm': size === 'sm',
+    'menu-md': size === 'md',
+    'menu-lg': size === 'lg',
+    'menu-xl': size === 'xl',
+    'menu-vertical': direction === 'vertical',
+    'menu-horizontal': direction === 'horizontal',
+  });
+
+  return <ul className={cn(menuBaseClassName, className)}>{children}</ul>;
 };

 export default Menu;
@@ -0,0 +1,92 @@
+import Link from 'next/link';
+import Menu from '@/components/menu/Menu';
+import { Icon } from '@iconify/react';
+import { cn, isPathActive } from '@/lib/helper';
+
+export interface SidebarMenuItem {
+  type?: 'item' | 'title';
+  text: string;
+  link: string;
+  icon?: string;
+  submenu?: SidebarMenuItem[];
+}
+
+interface SidebarMenuItemProps {
+  item: SidebarMenuItem;
+  activeLink: string;
+}
+
+interface SidebarMenuProps {
+  menu: SidebarMenuItem[];
+  activeLink: string;
+}
+
+const SidebarMenuItem = ({ item, activeLink }: SidebarMenuItemProps) => {
+  const isItemActive = isPathActive(activeLink, item.link);
+
+  const menuItemWithoutSubmenu = (
+    <li>
+      <Link
+        href={item.link}
+        className={cn(
+          {
+            'menu-active border-2 border-solid border-base-300': isItemActive,
+          },
+          'px-3 py-1.5'
+        )}
+      >
+        {item.icon && <Icon icon={item.icon} width={20} height={20} />}
+
+        <span className='text-base'>{item.text}</span>
+      </Link>
+    </li>
+  );
+
+  if (!item.submenu || item.submenu.length === 0) {
+    return menuItemWithoutSubmenu;
+  }
+
+  const menuItemWithSubmenu = (
+    <li>
+      <details open={isItemActive}>
+        <summary
+          className={cn({
+            'text-primary': isItemActive,
+          })}
+        >
+          {item.icon && <Icon icon={item.icon} width={20} height={20} />}
+
+          <span className='text-base'>{item.text}</span>
+        </summary>
+
+        <ul>
+          {item.submenu.map((submenuItem, submenuIdx) => (
+            <SidebarMenuItem
+              key={`submenu#${submenuIdx}`}
+              item={submenuItem}
+              activeLink={activeLink}
+            />
+          ))}
+        </ul>
+      </details>
+    </li>
+  );
+
+  return menuItemWithSubmenu;
+};
+
+const SidebarMenu = ({ menu, activeLink }: SidebarMenuProps) => {
+  return (
+    <Menu>
+      {menu.map((menuItem, menuIdx) => (
+        <SidebarMenuItem
+          key={menuIdx}
+          item={menuItem}
+          activeLink={activeLink}
+        />
+      ))}
+    </Menu>
+  );
+};
+
+export default SidebarMenu;
@@ -0,0 +1,104 @@
+'use client';
+
+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 {
+  ClosingGeneralInformation,
+  BaseClosingSales,
+} from '@/types/api/closing';
+import ClosingSapronakTabContent from './ClosingSapronakTabContent';
+import SalesReportTable from './sale/SalesReportTable';
+
+interface ClosingDetailProps {
+  id: number;
+  initialValue?: ClosingGeneralInformation;
+  salesData?: BaseClosingSales;
+}
+
+const ClosingDetail: React.FC<ClosingDetailProps> = ({
+  id,
+  initialValue,
+  salesData,
+}) => {
+  const [activeTab, setActiveTab] = useState<string>('sapronak');
+
+  const closingDetailTabs = useMemo(() => {
+    const validTabs = [
+      {
+        id: 'sapronak',
+        label: 'Sapronak',
+        content: <ClosingSapronakTabContent projectFlockId={id} />,
+      },
+      {
+        id: 'perhitunganSapronak',
+        label: 'Perhitungan Sapronak',
+        content: 'Perhitungan Sapronak',
+      },
+      {
+        id: 'penjualan',
+        label: 'Penjualan',
+        content: <SalesReportTable initialValues={salesData} />,
+      },
+      {
+        id: 'overhead',
+        label: 'Overhead',
+        content: 'Overhead',
+      },
+      {
+        id: 'hppEkspedisi',
+        label: 'HPP Ekspedisi',
+        content: 'HPP Ekspedisi',
+      },
+      {
+        id: 'dataProduksi',
+        label: 'Data Produksi',
+        content: 'Data Produksi',
+      },
+      {
+        id: 'keuangan',
+        label: 'Keuangan',
+        content: 'Keuangan',
+      },
+    ];
+
+    return validTabs;
+  }, [initialValue]);
+
+  return (
+    <>
+      <section className='w-full max-w-7xl pb-16'>
+        <header className='flex flex-col gap-4'>
+          <Button
+            href='/closing'
+            variant='link'
+            className='w-fit p-0 text-primary'
+          >
+            <Icon icon='uil:arrow-left' width={24} height={24} />
+            Kembali
+          </Button>
+
+          <h1 className='text-2xl font-bold text-center'>Detail Closing</h1>
+        </header>
+
+        <ClosingGeneralInformationTable initialValue={initialValue} />
+
+        <Tabs
+          activeTabId={activeTab}
+          onTabChange={setActiveTab}
+          tabs={closingDetailTabs}
+          variant='lifted'
+          className={{
+            wrapper: 'w-full mt-4',
+          }}
+        />
+      </section>
+    </>
+  );
+};
+
+export default ClosingDetail;
@@ -0,0 +1,100 @@
+import { ClosingGeneralInformation } from '@/types/api/closing';
+
+interface ClosingGeneralInformationProps {
+  initialValue?: ClosingGeneralInformation;
+}
+
+const ClosingGeneralInformationTable = ({
+  initialValue,
+}: ClosingGeneralInformationProps) => {
+  return (
+    <div className='w-full my-4 @container'>
+      <div className='flex flex-col @sm:flex-row gap-4'>
+        <div className='w-full'>
+          <div className='overflow-x-auto'>
+            <table className='table table-zebra table-sm'>
+              <tbody>
+                <tr>
+                  <td>Lokasi</td>
+                  <td>:</td>
+                  <td>{initialValue?.location_name}</td>
+                </tr>
+                <tr>
+                  <td>Periode</td>
+                  <td>:</td>
+                  <td>{initialValue?.period}</td>
+                </tr>
+                <tr>
+                  <td>Kategori</td>
+                  <td>:</td>
+                  <td>{initialValue?.project_category}</td>
+                </tr>
+                <tr>
+                  <td>Populasi</td>
+                  <td>:</td>
+                  <td>{initialValue?.population} Ekor</td>
+                </tr>
+                <tr>
+                  <td>Jenis Project</td>
+                  <td>:</td>
+                  <td>{initialValue?.project_type}</td>
+                </tr>
+                <tr className='table-row @sm:hidden'>
+                  <td>Kandang Aktif</td>
+                  <td>:</td>
+                  <td>{initialValue?.active_house_count} Kandang</td>
+                </tr>
+                <tr className='table-row @sm:hidden'>
+                  <td>Status Pembayaran Penjualan</td>
+                  <td>:</td>
+                  <td>{initialValue?.sales_payment_status}</td>
+                </tr>
+                <tr className='table-row @sm:hidden'>
+                  <td>Status Project</td>
+                  <td>:</td>
+                  <td>{initialValue?.project_status}</td>
+                </tr>
+                <tr className='table-row @sm:hidden'>
+                  <td>Status Closing</td>
+                  <td>:</td>
+                  <td>{initialValue?.closing_status}</td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+
+        <div className='w-full hidden @sm:block'>
+          <div className='overflow-x-auto'>
+            <table className='table table-zebra table-sm'>
+              <tbody>
+                <tr>
+                  <td>Kandang Aktif</td>
+                  <td>:</td>
+                  <td>{initialValue?.active_house_count} Kandang</td>
+                </tr>
+                <tr>
+                  <td>Status Pembayaran Penjualan</td>
+                  <td>:</td>
+                  <td>{initialValue?.sales_payment_status}</td>
+                </tr>
+                <tr>
+                  <td>Status Project</td>
+                  <td>:</td>
+                  <td>{initialValue?.project_status}</td>
+                </tr>
+                <tr>
+                  <td>Status Closing</td>
+                  <td>:</td>
+                  <td>{initialValue?.closing_status}</td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default ClosingGeneralInformationTable;
@@ -0,0 +1,209 @@
+'use client';
+
+import { ChangeEventHandler, useEffect, useState } from 'react';
+import useSWR from 'swr';
+import { ColumnDef, SortingState } from '@tanstack/react-table';
+
+import { Icon } from '@iconify/react';
+import Table from '@/components/Table';
+import DebouncedTextInput from '@/components/input/DebouncedTextInput';
+import Card from '@/components/Card';
+import Collapse from '@/components/Collapse';
+
+import { cn, formatDate, formatNumber } from '@/lib/helper';
+import { isResponseSuccess } from '@/lib/api-helper';
+import { useTableFilter } from '@/services/hooks/useTableFilter';
+import { ClosingApi } from '@/services/api/closing';
+import { ClosingIncomingSapronak } from '@/types/api/closing';
+
+interface ClosingIncomingSapronaksTableProps {
+  projectFlockId: number;
+}
+
+const ClosingIncomingSapronaksTable = ({
+  projectFlockId,
+}: ClosingIncomingSapronaksTableProps) => {
+  const {
+    state: tableFilterState,
+    updateFilter,
+    setPage,
+    setPageSize,
+    toQueryString: getTableFilterQueryString,
+  } = useTableFilter({
+    initial: {
+      search: '',
+      nameSort: '',
+    },
+    paramMap: {
+      page: 'page',
+      pageSize: 'limit',
+      nameSort: 'sort_name',
+    },
+  });
+
+  const { data: incomingSapronaks, isLoading: isLoadingIncomingSapronaks } =
+    useSWR(
+      `${ClosingApi.basePath}/${projectFlockId}/sapronak${getTableFilterQueryString()}&type=incoming`,
+      ClosingApi.getAllIncomingSapronakFetcher,
+      {
+        keepPreviousData: true,
+      }
+    );
+
+  const [open, setOpen] = useState(true);
+
+  const [sorting, setSorting] = useState<SortingState>([]);
+  const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
+
+  const incomingSapronaksColumns: ColumnDef<ClosingIncomingSapronak>[] = [
+    {
+      header: '#',
+      cell: (props) => props.row.index + 1,
+    },
+    {
+      accessorKey: 'date',
+      header: 'Tanggal',
+      cell: (props) => formatDate(props.row.original.date, 'DD MMM YYYY'),
+    },
+    {
+      accessorKey: 'reference_number',
+      header: 'No. Referensi',
+    },
+    {
+      accessorKey: 'transaction_type',
+      header: 'Jenis Transaksi',
+    },
+    {
+      accessorKey: 'product_name',
+      header: 'Produk',
+    },
+    {
+      accessorKey: 'product_category',
+      header: 'Kategori Produk',
+    },
+    {
+      accessorKey: 'source_warehouse',
+      header: 'Gudang Asal',
+    },
+    {
+      accessorKey: 'destination_warehouse',
+      header: 'Gudang Tujuan',
+    },
+    {
+      accessorKey: 'quantity',
+      header: 'Kuantitas',
+      cell: (props) =>
+        `${formatNumber(props.row.original.quantity)} ${props.row.original.unit}`,
+    },
+    {
+      accessorKey: 'notes',
+      header: 'Keterangan',
+    },
+  ];
+
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    updateFilter('search', e.target.value);
+  };
+
+  // track sorting
+  useEffect(() => {
+    const isNameSorted = sorting.find((sortItem) => sortItem.id === 'name');
+
+    if (!isNameSorted) {
+      updateFilter('nameSort', '');
+    } else {
+      updateFilter('nameSort', isNameSorted.desc ? 'desc' : 'asc');
+    }
+  }, [sorting, updateFilter]);
+
+  useEffect(() => {
+    if (!open) {
+      setOpen(
+        isResponseSuccess(incomingSapronaks)
+          ? incomingSapronaks.data.length > 0
+          : false
+      );
+    }
+  }, [incomingSapronaks, isResponseSuccess]);
+
+  return (
+    <Card
+      className={{
+        wrapper: 'w-full',
+        body: 'p-4 shadow',
+      }}
+    >
+      <Collapse
+        open={open}
+        onOpenChange={setOpen}
+        title={
+          <div className='card-actions p-4 justify-between items-center w-full'>
+            <div className='card-title'>Sapronak Masuk</div>
+
+            <Icon
+              icon='material-symbols:keyboard-arrow-down'
+              width={24}
+              height={24}
+              className={cn('text-primary transition-transform', {
+                '-rotate-180': open,
+              })}
+            />
+          </div>
+        }
+        className='w-full!'
+        titleClassName='w-full p-0!'
+      >
+        <div className='w-full p-0'>
+          <div className='flex flex-col gap-2 mb-4'>
+            <div className='w-full flex flex-col sm:flex-row justify-start items-end sm:items-center gap-4'>
+              <DebouncedTextInput
+                name='search'
+                placeholder='Cari Sapronak Masuk'
+                value={tableFilterState.search}
+                onChange={searchChangeHandler}
+                className={{ wrapper: 'sm:max-w-3xs' }}
+              />
+            </div>
+          </div>
+
+          <Table<ClosingIncomingSapronak>
+            data={
+              isResponseSuccess(incomingSapronaks)
+                ? incomingSapronaks?.data
+                : []
+            }
+            columns={incomingSapronaksColumns}
+            pageSize={tableFilterState.pageSize}
+            onPageSizeChange={setPageSize}
+            rowOptions={[10, 20, 50, 100]}
+            page={
+              isResponseSuccess(incomingSapronaks)
+                ? incomingSapronaks?.meta?.page
+                : 0
+            }
+            totalItems={
+              isResponseSuccess(incomingSapronaks)
+                ? incomingSapronaks?.meta?.total_results
+                : 0
+            }
+            onPageChange={setPage}
+            isLoading={isLoadingIncomingSapronaks}
+            sorting={sorting}
+            setSorting={setSorting}
+            rowSelection={rowSelection}
+            setRowSelection={setRowSelection}
+            className={{
+              containerClassName: cn({
+                'w-full mb-20':
+                  isResponseSuccess(incomingSapronaks) &&
+                  incomingSapronaks?.data?.length === 0,
+              }),
+            }}
+          />
+        </div>
+      </Collapse>
+    </Card>
+  );
+};
+
+export default ClosingIncomingSapronaksTable;
@@ -0,0 +1,209 @@
+'use client';
+
+import { ChangeEventHandler, useEffect, useState } from 'react';
+import useSWR from 'swr';
+import { ColumnDef, SortingState } from '@tanstack/react-table';
+
+import { Icon } from '@iconify/react';
+import Table from '@/components/Table';
+import DebouncedTextInput from '@/components/input/DebouncedTextInput';
+import Card from '@/components/Card';
+import Collapse from '@/components/Collapse';
+
+import { cn, formatDate, formatNumber } from '@/lib/helper';
+import { isResponseSuccess } from '@/lib/api-helper';
+import { useTableFilter } from '@/services/hooks/useTableFilter';
+import { ClosingApi } from '@/services/api/closing';
+import { ClosingOutgoingSapronak } from '@/types/api/closing';
+
+interface ClosingOutgoingSapronaksTableProps {
+  projectFlockId: number;
+}
+
+const ClosingOutgoingSapronaksTable = ({
+  projectFlockId,
+}: ClosingOutgoingSapronaksTableProps) => {
+  const {
+    state: tableFilterState,
+    updateFilter,
+    setPage,
+    setPageSize,
+    toQueryString: getTableFilterQueryString,
+  } = useTableFilter({
+    initial: {
+      search: '',
+      nameSort: '',
+    },
+    paramMap: {
+      page: 'page',
+      pageSize: 'limit',
+      nameSort: 'sort_name',
+    },
+  });
+
+  const { data: outgoingSapronaks, isLoading: isLoadingOutgoingSapronaks } =
+    useSWR(
+      `${ClosingApi.basePath}/${projectFlockId}/sapronak${getTableFilterQueryString()}&type=outgoing`,
+      ClosingApi.getAllOutgoingSapronakFetcher,
+      {
+        keepPreviousData: true,
+      }
+    );
+
+  const [open, setOpen] = useState(true);
+
+  const [sorting, setSorting] = useState<SortingState>([]);
+  const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
+
+  const outgoingSapronaksColumns: ColumnDef<ClosingOutgoingSapronak>[] = [
+    {
+      header: '#',
+      cell: (props) => props.row.index + 1,
+    },
+    {
+      accessorKey: 'date',
+      header: 'Tanggal',
+      cell: (props) => formatDate(props.row.original.date, 'DD MMM YYYY'),
+    },
+    {
+      accessorKey: 'reference_number',
+      header: 'No. Referensi',
+    },
+    {
+      accessorKey: 'transaction_type',
+      header: 'Jenis Transaksi',
+    },
+    {
+      accessorKey: 'product_name',
+      header: 'Produk',
+    },
+    {
+      accessorKey: 'product_category',
+      header: 'Kategori Produk',
+    },
+    {
+      accessorKey: 'source_warehouse',
+      header: 'Gudang Asal',
+    },
+    {
+      accessorKey: 'destination_warehouse',
+      header: 'Gudang Tujuan',
+    },
+    {
+      accessorKey: 'quantity',
+      header: 'Kuantitas',
+      cell: (props) =>
+        `${formatNumber(props.row.original.quantity)} ${props.row.original.unit}`,
+    },
+    {
+      accessorKey: 'notes',
+      header: 'Keterangan',
+    },
+  ];
+
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    updateFilter('search', e.target.value);
+  };
+
+  // track sorting
+  useEffect(() => {
+    const isNameSorted = sorting.find((sortItem) => sortItem.id === 'name');
+
+    if (!isNameSorted) {
+      updateFilter('nameSort', '');
+    } else {
+      updateFilter('nameSort', isNameSorted.desc ? 'desc' : 'asc');
+    }
+  }, [sorting, updateFilter]);
+
+  useEffect(() => {
+    if (!open) {
+      setOpen(
+        isResponseSuccess(outgoingSapronaks)
+          ? outgoingSapronaks.data.length > 0
+          : false
+      );
+    }
+  }, [outgoingSapronaks, isResponseSuccess]);
+
+  return (
+    <Card
+      className={{
+        wrapper: 'w-full',
+        body: 'p-4 shadow',
+      }}
+    >
+      <Collapse
+        open={open}
+        onOpenChange={setOpen}
+        title={
+          <div className='card-actions p-4 justify-between items-center w-full'>
+            <div className='card-title'>Sapronak Keluar</div>
+
+            <Icon
+              icon='material-symbols:keyboard-arrow-down'
+              width={24}
+              height={24}
+              className={cn('text-primary transition-transform', {
+                '-rotate-180': open,
+              })}
+            />
+          </div>
+        }
+        className='w-full!'
+        titleClassName='w-full p-0!'
+      >
+        <div className='w-full p-0'>
+          <div className='flex flex-col gap-2 mb-4'>
+            <div className='w-full flex flex-col sm:flex-row justify-start items-end sm:items-center gap-4'>
+              <DebouncedTextInput
+                name='search'
+                placeholder='Cari Sapronak Keluar'
+                value={tableFilterState.search}
+                onChange={searchChangeHandler}
+                className={{ wrapper: 'sm:max-w-3xs' }}
+              />
+            </div>
+          </div>
+
+          <Table<ClosingOutgoingSapronak>
+            data={
+              isResponseSuccess(outgoingSapronaks)
+                ? outgoingSapronaks?.data
+                : []
+            }
+            columns={outgoingSapronaksColumns}
+            pageSize={tableFilterState.pageSize}
+            onPageSizeChange={setPageSize}
+            rowOptions={[10, 20, 50, 100]}
+            page={
+              isResponseSuccess(outgoingSapronaks)
+                ? outgoingSapronaks?.meta?.page
+                : 0
+            }
+            totalItems={
+              isResponseSuccess(outgoingSapronaks)
+                ? outgoingSapronaks?.meta?.total_results
+                : 0
+            }
+            onPageChange={setPage}
+            isLoading={isLoadingOutgoingSapronaks}
+            sorting={sorting}
+            setSorting={setSorting}
+            rowSelection={rowSelection}
+            setRowSelection={setRowSelection}
+            className={{
+              containerClassName: cn({
+                'w-full mb-20':
+                  isResponseSuccess(outgoingSapronaks) &&
+                  outgoingSapronaks?.data?.length === 0,
+              }),
+            }}
+          />
+        </div>
+      </Collapse>
+    </Card>
+  );
+};
+
+export default ClosingOutgoingSapronaksTable;
@@ -0,0 +1,26 @@
+'use client';
+
+import ClosingIncomingSapronaksTable from '@/components/pages/closing/ClosingIncomingSapronaksTable';
+import ClosingOutgoingSapronaksTable from '@/components/pages/closing/ClosingOutgoingSapronaksTable';
+
+interface ClosingSapronakTableProps {
+  projectFlockId?: number;
+}
+
+const ClosingSapronakTabContent = ({
+  projectFlockId,
+}: ClosingSapronakTableProps) => {
+  return (
+    <div className='flex flex-col gap-4'>
+      {projectFlockId && (
+        <>
+          <ClosingIncomingSapronaksTable projectFlockId={projectFlockId} />
+
+          <ClosingOutgoingSapronaksTable projectFlockId={projectFlockId} />
+        </>
+      )}
+    </div>
+  );
+};
+
+export default ClosingSapronakTabContent;
@@ -0,0 +1,299 @@
+'use client';
+
+import { ChangeEventHandler, useEffect, useState } from 'react';
+import useSWR from 'swr';
+import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
+
+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 { cn, formatCurrency, 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',
+  },
+];
+
+const RowOptionsMenu = ({
+  type = 'dropdown',
+  props,
+}: {
+  type: 'dropdown' | 'collapse';
+  props: CellContext<Closing, unknown>;
+}) => {
+  return (
+    <RowOptionsMenuWrapper type={type}>
+      {/* TODO: apply RBAC */}
+      <div className='w-full max-h-40 overflow-auto flex flex-col gap-1'>
+        <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>
+      </div>
+    </RowOptionsMenuWrapper>
+  );
+};
+
+const ClosingsTable = () => {
+  const {
+    state: tableFilterState,
+    updateFilter,
+    setPage,
+    setPageSize,
+    toQueryString: getTableFilterQueryString,
+  } = useTableFilter({
+    initial: {
+      search: '',
+      nameSort: '',
+      transactionDate: '',
+      realizationDate: '',
+      locationId: '',
+      projectStatus: '',
+      userId: '',
+    },
+    paramMap: {
+      page: 'page',
+      pageSize: 'limit',
+      nameSort: 'sort_name',
+      transactionDate: 'transaction_date',
+      realizationDate: 'realization_date',
+      locationId: 'location_id',
+      projectStatus: 'project_status',
+      userId: 'user_id',
+    },
+  });
+
+  const { data: closings, isLoading: isLoadingClosings } = useSWR(
+    `${ClosingApi.basePath}${getTableFilterQueryString()}`,
+    ClosingApi.getAllFetcher
+  );
+
+  const [sorting, setSorting] = useState<SortingState>([]);
+  const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
+
+  const closingsColumns: ColumnDef<Closing>[] = [
+    {
+      header: '#',
+      cell: (props) => props.row.index + 1,
+    },
+    {
+      accessorKey: 'location_name',
+      header: 'Lokasi',
+    },
+    {
+      accessorKey: 'project_category',
+      header: 'Kategori',
+    },
+    {
+      accessorKey: 'period',
+      header: 'Periode',
+    },
+    {
+      accessorKey: 'closing_date',
+      header: 'Periode',
+      cell: (props) =>
+        formatDate(props.row.original.closing_date, 'DD MMM YYYY'),
+    },
+    {
+      accessorKey: 'shed_label',
+      header: 'Jumlah Kandang',
+    },
+    {
+      accessorKey: 'sales_paid_amount',
+      header: 'Jumlah Sudah Bayar',
+      cell: (props) => (
+        <span className='text-success'>
+          {formatCurrency(props.row.original.sales_paid_amount)}
+        </span>
+      ),
+    },
+    {
+      accessorKey: 'sales_remaining_amount',
+      header: 'Jumlah Sisa Bayar',
+      cell: (props) => (
+        <span className='text-error'>
+          {formatCurrency(props.row.original.sales_remaining_amount)}
+        </span>
+      ),
+    },
+    {
+      accessorKey: 'sales_payment_status',
+      header: 'Status Pembayaran',
+    },
+    {
+      accessorKey: 'project_status',
+      header: 'Status',
+    },
+    {
+      header: 'Aksi',
+      cell: (props) => {
+        const currentPageSize = props.table.getPaginationRowModel().rows.length;
+        const currentPageRows = props.table.getPaginationRowModel().flatRows;
+        const currentRowRelativeIndex =
+          currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
+
+        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 3;
+
+        return (
+          <>
+            {currentPageSize > 3 && (
+              <RowDropdownOptions isLast2Rows={isLast2Rows}>
+                <RowOptionsMenu type='dropdown' props={props} />
+              </RowDropdownOptions>
+            )}
+
+            {currentPageSize <= 3 && (
+              <RowCollapseOptions>
+                <RowOptionsMenu type='collapse' props={props} />
+              </RowCollapseOptions>
+            )}
+          </>
+        );
+      },
+    },
+  ];
+
+  const {
+    setInputValue: setLocationInputValue,
+    options: locationOptions,
+    isLoadingOptions: isLoadingLocationOptions,
+  } = useSelect<Location>(LocationApi.basePath, 'id', 'name');
+
+  const [selectedLocation, setSelectedLocation] = useState<OptionType | null>(
+    null
+  );
+
+  const locationChangeHandler = (val: OptionType | OptionType[] | null) => {
+    setSelectedLocation(val as OptionType);
+    updateFilter(
+      'locationId',
+      val ? ((val as OptionType).value as string) : ''
+    );
+  };
+
+  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 searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    updateFilter('search', e.target.value);
+  };
+
+  // track sorting
+  useEffect(() => {
+    const isNameSorted = sorting.find((sortItem) => sortItem.id === 'name');
+
+    if (!isNameSorted) {
+      updateFilter('nameSort', '');
+    } else {
+      updateFilter('nameSort', isNameSorted.desc ? 'desc' : 'asc');
+    }
+  }, [sorting, updateFilter]);
+
+  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'>
+              <DebouncedTextInput
+                name='search'
+                placeholder='Cari Closing'
+                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}
+                isClearable
+                className={{
+                  wrapper: 'col-span-12 sm:col-span-6',
+                }}
+              />
+
+              <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',
+                }}
+              />
+            </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,
+            }),
+          }}
+        />
+      </div>
+    </>
+  );
+};
+
+export default ClosingsTable;
@@ -6,7 +6,7 @@ import Table from '@/components/Table';
 import Card from '@/components/Card';
 import Badge from '@/components/Badge';
 import { formatCurrency, formatNumber, formatDate } from '@/lib/helper';
-import { BaseClosingSales, BaseSales } from '@/types/api/closing/closing';
+import { BaseClosingSales, BaseSales } from '@/types/api/closing';
 import { Product } from '@/types/api/master-data/product';
 import { Customer } from '@/types/api/master-data/customer';
 import { Kandang } from '@/types/api/master-data/kandang';
@@ -263,7 +263,7 @@ const SalesReportTable = ({
                tableWrapperClassName: 'overflow-x-auto',
                tableClassName: 'w-full table-auto text-sm',
                headerColumnClassName:
-                  'px-4 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end whitespace-nowrap border-l border-l-gray-200 border-r border-r-gray-200 border-t border-t-gray-200 border-gray-200 border-b-0',
+                  'px-4 py-3 text-xs font-semibold text-gray-500 whitespace-nowrap border-l border-l-gray-200 border-r border-r-gray-200 border-t border-t-gray-200 border-gray-200 border-b-0',
                bodyRowClassName:
                  'hover:bg-gray-50 transition-colors border-b border-gray-200 first:border-t first:border-t-gray-200 border-l border-l-gray-200 border-r border-r-gray-200',
                bodyColumnClassName:
@@ -207,7 +207,7 @@ const ExpenseRealizationContent = ({
            let expenseGrandTotal = 0;

            kandangExpense.pengajuans?.forEach(
-              (item) => (expenseGrandTotal += item.total_price)
+              (item) => (expenseGrandTotal += item.price)
            );

            return (
@@ -238,7 +238,7 @@ const ExpenseRealizationContent = ({
                        <tr key={pengajuanIdx}>
                          <td>{pengajuanItem.nonstock.name}</td>
                          <td>{pengajuanItem.qty}</td>
-                          <td>{formatCurrency(pengajuanItem.total_price)}</td>
+                          <td>{formatCurrency(pengajuanItem.price)}</td>
                          <td className='w-xs'>{pengajuanItem.note ?? '-'}</td>
                        </tr>
                      )
@@ -269,7 +269,7 @@ const ExpenseRealizationContent = ({
            let expenseGrandTotal = 0;

            kandangExpense.realisasi?.forEach(
-              (item) => (expenseGrandTotal += item.total_price)
+              (item) => (expenseGrandTotal += item.price)
            );

            return (
@@ -300,7 +300,7 @@ const ExpenseRealizationContent = ({
                        <tr key={realisasiIdx}>
                          <td>{realisasiItem.nonstock.name}</td>
                          <td>{realisasiItem.qty}</td>
-                          <td>{formatCurrency(realisasiItem.total_price)}</td>
+                          <td>{formatCurrency(realisasiItem.price)}</td>
                          <td className='w-xs'>{realisasiItem.note ?? '-'}</td>
                        </tr>
                      )
@@ -402,7 +402,10 @@ const ExpenseRequestContent = ({
                  <th>Tanggal Transaksi</th>
                  <th>:</th>
                  <td>
-                    {formatDate(initialValues?.expense_date, 'DD MMMM YYYY')}
+                    {formatDate(
+                      initialValues?.transaction_date,
+                      'DD MMMM YYYY'
+                    )}
                  </td>
                </tr>
                <tr>
@@ -529,7 +532,7 @@ const ExpenseRequestContent = ({
                let expenseGrandTotal = 0;

                kandangExpense.pengajuans?.forEach(
-                  (item) => (expenseGrandTotal += item.total_price)
+                  (item) => (expenseGrandTotal += item.price)
                );

                return (
@@ -550,7 +553,7 @@ const ExpenseRequestContent = ({
                        <tr>
                          <th>Nonstock</th>
                          <th>Total Kuantitas</th>
-                          <th>Total Biaya</th>
+                          <th>Harga Satuan</th>
                          <th>Catatan</th>
                        </tr>
                      </thead>
@@ -560,9 +563,7 @@ const ExpenseRequestContent = ({
                            <tr key={pengajuanIdx}>
                              <td>{pengajuanItem.nonstock.name}</td>
                              <td>{pengajuanItem.qty}</td>
-                              <td>
-                                {formatCurrency(pengajuanItem.total_price)}
-                              </td>
+                              <td>{formatCurrency(pengajuanItem.price)}</td>
                              <td className='w-xs'>
                                {pengajuanItem.note ?? '-'}
                              </td>
@@ -263,11 +263,11 @@ const ExpensesTable = () => {
      },
    },
    {
-      accessorKey: 'expense_date',
+      accessorKey: 'transaction_date',
      header: 'Tanggal Pengajuan',
      cell: (props) =>
-        props.row.original.expense_date
-          ? formatDate(props.row.original.expense_date, 'DD MMM YYYY')
+        props.row.original.transaction_date
+          ? formatDate(props.row.original.transaction_date, 'DD MMM YYYY')
          : '-',
    },
    {
@@ -27,7 +27,7 @@ type ExpenseRealizationFormSchemaType = {
        label: string;
      };
      quantity?: number;
-      total_cost?: number;
+      price?: number;
      notes?: string;
    }[];
  }[];
@@ -82,7 +82,7 @@ export const ExpenseRealizationFormSchema: Yup.ObjectSchema<ExpenseRealizationFo
                  label: Yup.string().required(),
                }).required('Nonstock wajib diisi!'),
                quantity: Yup.number().required('Total kuantitas wajib diisi!'),
-                total_cost: Yup.number().required('Total biaya wajib diisi!'),
+                price: Yup.number().required('Harga satuan wajib diisi!'),
                notes: Yup.string(),
              })
            )
@@ -155,7 +155,7 @@ export const getExpenseRealizationFormInitialValues = (
                    label: realisasiItem.nonstock.name,
                  },
                  quantity: realisasiItem.qty,
-                  total_cost: realisasiItem.total_price,
+                  price: realisasiItem.price,
                  notes: realisasiItem.note,
                };
              })
@@ -166,7 +166,7 @@ export const getExpenseRealizationFormInitialValues = (
                    label: expenseItem.nonstock.name,
                  },
                  quantity: expenseItem.qty,
-                  total_cost: expenseItem.total_price,
+                  price: expenseItem.price,
                  notes: expenseItem.note,
                }))
              : [];
@@ -98,15 +98,10 @@ const ExpenseRealizationForm = ({

      values.realizations.forEach((realization) => {
        realization.cost_items.forEach((costItem) => {
-          const unitPrice =
-            parseFloat(String(costItem.total_cost)) /
-            parseFloat(String(costItem.quantity));
-
          const realizationItem = {
            expense_nonstock_id: costItem.nonstock?.value as number,
            qty: parseFloat(String(costItem.quantity)) as number,
-            unit_price: unitPrice,
-            total_price: parseFloat(String(costItem.total_cost)) as number,
+            price: parseFloat(String(costItem.price)) as number,
            notes: costItem.notes ?? '',
          };

@@ -177,7 +172,7 @@ const ExpenseRealizationForm = ({
          {
            nonstock: undefined,
            quantity: undefined,
-            total_cost: undefined,
+            price: undefined,
            notes: '',
          },
        ],
@@ -48,7 +48,7 @@ const ExpenseRealizationKandangDetailExpense: React.FC<
  };

  const isExpenseRepeaterInputError = (
-    column: 'nonstock' | 'quantity' | 'total_cost' | 'notes',
+    column: 'nonstock' | 'quantity' | 'price' | 'notes',
    kandangExpenseIdx: number,
    expenseIdx: number
  ) => {
@@ -112,7 +112,7 @@ const ExpenseRealizationKandangDetailExpense: React.FC<
                        <tr>
                          <th>Nonstock</th>
                          <th>Total Kuantitas</th>
-                          <th>Total Biaya</th>
+                          <th>Harga Satuan</th>
                          <th>Catatan</th>
                        </tr>
                      </thead>
@@ -163,17 +163,17 @@ const ExpenseRealizationKandangDetailExpense: React.FC<

                              <td className='p-2'>
                                <NumberInput
-                                  name={`realizations[${kandangExpenseIdx}].cost_items[${expenseIdx}].total_cost`}
-                                  placeholder='Masukkan Total Biaya'
+                                  name={`realizations[${kandangExpenseIdx}].cost_items[${expenseIdx}].price`}
+                                  placeholder='Masukkan Harga Satuan'
                                  value={
                                    formik.values.realizations[
                                      kandangExpenseIdx
-                                    ].cost_items[expenseIdx].total_cost ?? ''
+                                    ].cost_items[expenseIdx].price ?? ''
                                  }
                                  onChange={formik.handleChange}
                                  onBlur={formik.handleBlur}
                                  isError={isExpenseRepeaterInputError(
-                                    'total_cost',
+                                    'price',
                                    kandangExpenseIdx,
                                    expenseIdx
                                  )}
@@ -20,7 +20,7 @@ type ExpenseFormSchemaType = {
  existing_documents?: { id: number; name: string; url: string }[];
  deleted_documents?: number[];
  documents?: File[];
-  cost_per_kandangs: {
+  expense_nonstocks: {
    kandang_id: number;
    cost_items: {
      nonstock?: {
@@ -28,7 +28,7 @@ type ExpenseFormSchemaType = {
        label: string;
      };
      quantity?: number;
-      total_cost?: number;
+      price?: number;
      notes?: string;
    }[];
  }[];
@@ -74,7 +74,7 @@ export const ExpenseRequestFormSchema: Yup.ObjectSchema<ExpenseFormSchemaType> =

    documents: Yup.array().of(Yup.mixed<File>().required()).optional(),

-    cost_per_kandangs: Yup.array()
+    expense_nonstocks: Yup.array()
      .of(
        Yup.object({
          kandang_id: Yup.number().min(1, 'Wajib memilih kandang!').required(),
@@ -86,7 +86,7 @@ export const ExpenseRequestFormSchema: Yup.ObjectSchema<ExpenseFormSchemaType> =
                  label: Yup.string().required(),
                }).required('Nonstock wajib diisi!'),
                quantity: Yup.number().required('Total kuantitas wajib diisi!'),
-                total_cost: Yup.number().required('Total biaya wajib diisi!'),
+                price: Yup.number().required('Harga satuan wajib diisi!'),
                notes: Yup.string(),
              })
            )
@@ -128,8 +128,8 @@ export const getExpenseFormInitialValues = (
          label: initialValues.location.name,
        }
      : undefined,
-    transaction_date: initialValues?.expense_date
-      ? formatDate(initialValues.expense_date, 'YYYY-MM-DD')
+    transaction_date: initialValues?.transaction_date
+      ? formatDate(initialValues.transaction_date, 'YYYY-MM-DD')
      : undefined,
    kandangs: initialValues?.kandangs.map((kandang) => ({
      id: kandang.kandang_id,
@@ -148,7 +148,7 @@ export const getExpenseFormInitialValues = (
    })),
    deleted_documents: [],
    documents: [],
-    cost_per_kandangs: initialValues?.kandangs
+    expense_nonstocks: initialValues?.kandangs
      ? initialValues.kandangs.map((kandangExpense) => ({
          kandang_id: kandangExpense.kandang_id,
          cost_items: kandangExpense.pengajuans
@@ -158,7 +158,7 @@ export const getExpenseFormInitialValues = (
                  label: expenseItem.nonstock.name,
                },
                quantity: expenseItem.qty,
-                total_cost: expenseItem.total_price,
+                price: expenseItem.price,
                notes: expenseItem.note,
              }))
            : [],
@@ -110,12 +110,12 @@ const ExpenseRequestForm = ({
        transaction_date: values?.transaction_date as string,
        supplier_id: values.supplier?.value as number,
        documents: values.documents as File[],
-        cost_per_kandangs: values.cost_per_kandangs.map((costPerKandang) => ({
-          kandang_id: costPerKandang.kandang_id,
-          cost_items: costPerKandang.cost_items.map((costItem) => ({
+        expense_nonstocks: values.expense_nonstocks.map((expenseNonstock) => ({
+          kandang_id: expenseNonstock.kandang_id,
+          cost_items: expenseNonstock.cost_items.map((costItem) => ({
            nonstock_id: costItem.nonstock?.value as number,
            quantity: parseFloat(String(costItem.quantity)) as number,
-            total_cost: parseFloat(String(costItem.total_cost)) as number,
+            price: parseFloat(String(costItem.price)) as number,
            notes: costItem.notes ?? '',
          })),
        })),
@@ -132,13 +132,13 @@ const ExpenseRequestForm = ({
            transaction_date: values?.transaction_date as string,
            supplier_id: values.supplier?.value as number,
            documents: values.documents as File[],
-            cost_per_kandang: values.cost_per_kandangs.map(
-              (costPerKandang) => ({
-                kandang_id: costPerKandang.kandang_id,
-                cost_items: costPerKandang.cost_items.map((costItem) => ({
+            expense_nonstocks: values.expense_nonstocks.map(
+              (expenseNonstock) => ({
+                kandang_id: expenseNonstock.kandang_id,
+                cost_items: expenseNonstock.cost_items.map((costItem) => ({
                  nonstock_id: costItem.nonstock?.value as number,
                  quantity: parseFloat(String(costItem.quantity)) as number,
-                  total_cost: parseFloat(String(costItem.total_cost)) as number,
+                  price: parseFloat(String(costItem.price)) as number,
                  notes: costItem.notes ?? '',
                })),
              })
@@ -179,53 +179,54 @@ const ExpenseRequestForm = ({
    formik.setFieldValue('location', val);

    formik.setFieldValue('kandangs', []);
-    formik.setFieldValue('cost_per_kandangs', []);
+    formik.setFieldValue('expense_nonstocks', []);
  };

  const kandangsChangeHandler = (kandangs: { id: number; name: string }[]) => {
    formik.setFieldTouched('kandangs', true);
    formik.setFieldValue('kandangs', kandangs);

-    const newCostPerKandangs = [...(formik.values.cost_per_kandangs ?? [])];
+    const newExpenseNonstocks = [...(formik.values.expense_nonstocks ?? [])];

-    // add new cost_per_kandangs
+    // add new expense_nonstocks
    kandangs.forEach((kandangItem) => {
-      const isKandangExistInCostPerKandangs = newCostPerKandangs.find(
-        (costPerKandangItem) => costPerKandangItem.kandang_id === kandangItem.id
+      const isKandangExistInExpenseNonstocks = newExpenseNonstocks.find(
+        (expenseNonstockItem) =>
+          expenseNonstockItem.kandang_id === kandangItem.id
      );

-      if (isKandangExistInCostPerKandangs) return;
+      if (isKandangExistInExpenseNonstocks) return;

-      newCostPerKandangs.push({
+      newExpenseNonstocks.push({
        kandang_id: kandangItem.id,
        cost_items: [
          {
            nonstock: undefined,
            quantity: undefined,
-            total_cost: undefined,
+            price: undefined,
            notes: '',
          },
        ],
      });
    });

-    // prune cost_per_kandangs
+    // prune expense_nonstocks
    const kandangIds = new Set(kandangs.map((kandang) => kandang.id));
-    const deletedCostPerKandangsIdx: number[] = [];
+    const deletedExpenseNonstocksIdx: number[] = [];

-    newCostPerKandangs.forEach((costPerKandang, idx) => {
-      const isCostPerKandangValid = kandangIds.has(costPerKandang.kandang_id);
+    newExpenseNonstocks.forEach((expenseNonstock, idx) => {
+      const isExpenseNonstockValid = kandangIds.has(expenseNonstock.kandang_id);

-      if (!isCostPerKandangValid) {
-        deletedCostPerKandangsIdx.push(idx);
+      if (!isExpenseNonstockValid) {
+        deletedExpenseNonstocksIdx.push(idx);
      }
    });

-    deletedCostPerKandangsIdx.forEach((deletedCostPerKandangIdx) => {
-      newCostPerKandangs.splice(deletedCostPerKandangIdx, 1);
+    deletedExpenseNonstocksIdx.forEach((deletedExpenseNonstockIdx) => {
+      newExpenseNonstocks.splice(deletedExpenseNonstockIdx, 1);
    });

-    formik.setFieldValue('cost_per_kandangs', newCostPerKandangs);
+    formik.setFieldValue('expense_nonstocks', newExpenseNonstocks);
  };

  const supplierChangeHandler = (val: OptionType | OptionType[] | null) => {
@@ -41,28 +41,28 @@ const ExpenseRequestKandangDetailExpense: React.FC<
    val: OptionType | OptionType[] | null
  ) => {
    formik.setFieldTouched(
-      `cost_per_kandangs[${kandangExpenseIdx}].cost_items[${expenseIdx}].nonstock`,
+      `expense_nonstocks[${kandangExpenseIdx}].cost_items[${expenseIdx}].nonstock`,
      true
    );
    formik.setFieldValue(
-      `cost_per_kandangs[${kandangExpenseIdx}].cost_items[${expenseIdx}].nonstock`,
+      `expense_nonstocks[${kandangExpenseIdx}].cost_items[${expenseIdx}].nonstock`,
      val
    );
  };

  const addExpenseItemHandler = (kandangExpenseIdx: number) => {
    const newExpensesValue = [
-      ...formik.values.cost_per_kandangs[kandangExpenseIdx].cost_items,
+      ...formik.values.expense_nonstocks[kandangExpenseIdx].cost_items,
      {
        nonstock: undefined,
-        total_cost: undefined,
+        price: undefined,
        quantity: undefined,
        notes: '',
      },
    ];

    formik.setFieldValue(
-      `cost_per_kandangs[${kandangExpenseIdx}].cost_items`,
+      `expense_nonstocks[${kandangExpenseIdx}].cost_items`,
      newExpensesValue
    );
  };
@@ -71,28 +71,28 @@ const ExpenseRequestKandangDetailExpense: React.FC<
    kandangExpenseIdx: number,
    expenseIdx: number
  ) => {
-    const path = `cost_per_kandangs[${kandangExpenseIdx}].cost_items`;
+    const path = `expense_nonstocks[${kandangExpenseIdx}].cost_items`;

    // trims values, errors, and touched at expenseIdx
    removeArrayItemAndSync(formik, path, expenseIdx);
  };

  const isExpenseRepeaterInputError = (
-    column: 'nonstock' | 'quantity' | 'total_cost' | 'notes',
+    column: 'nonstock' | 'quantity' | 'price' | 'notes',
    kandangExpenseIdx: number,
    expenseIdx: number
  ) => {
    return (
-      formik.touched.cost_per_kandangs?.[kandangExpenseIdx]?.cost_items?.[
+      formik.touched.expense_nonstocks?.[kandangExpenseIdx]?.cost_items?.[
        expenseIdx
      ]?.[column] &&
      Boolean(
-        formik.errors.cost_per_kandangs?.[kandangExpenseIdx] instanceof
+        formik.errors.expense_nonstocks?.[kandangExpenseIdx] instanceof
          Object &&
-          formik.errors.cost_per_kandangs?.[kandangExpenseIdx].cost_items?.[
+          formik.errors.expense_nonstocks?.[kandangExpenseIdx].cost_items?.[
            expenseIdx
          ] instanceof Object &&
-          formik.errors.cost_per_kandangs?.[kandangExpenseIdx].cost_items?.[
+          formik.errors.expense_nonstocks?.[kandangExpenseIdx].cost_items?.[
            expenseIdx
          ]?.[column]
      )
@@ -113,7 +113,7 @@ const ExpenseRequestKandangDetailExpense: React.FC<
      </div>

      <div className='w-full flex flex-col gap-6'>
-        {(formik.values.cost_per_kandangs.length === 0 ||
+        {(formik.values.expense_nonstocks.length === 0 ||
          !formik.values.supplier?.value) && (
          <div>
            <p className='text-sm text-gray-400 text-center'>
@@ -122,9 +122,9 @@ const ExpenseRequestKandangDetailExpense: React.FC<
          </div>
        )}

-        {formik.values.cost_per_kandangs.length > 0 &&
+        {formik.values.expense_nonstocks.length > 0 &&
          formik.values.supplier?.value &&
-          formik.values.cost_per_kandangs.map(
+          formik.values.expense_nonstocks.map(
            (kandangExpense, kandangExpenseIdx) => {
              const kandangName = formik.values.kandangs?.find(
                (kandang) => kandang.id === kandangExpense.kandang_id
@@ -147,7 +147,7 @@ const ExpenseRequestKandangDetailExpense: React.FC<
                            <tr>
                              <th>Nonstock</th>
                              <th>Total Kuantitas</th>
-                              <th>Total Biaya</th>
+                              <th>Harga Satuan</th>
                              <th>Catatan</th>
                              {type !== 'detail' && <th>Aksi</th>}
                            </tr>
@@ -178,10 +178,10 @@ const ExpenseRequestKandangDetailExpense: React.FC<
                                  <td className='p-2'>
                                    <NumberInput
                                      required
-                                      name={`cost_per_kandangs[${kandangExpenseIdx}].cost_items[${expenseIdx}].quantity`}
+                                      name={`expense_nonstocks[${kandangExpenseIdx}].cost_items[${expenseIdx}].quantity`}
                                      placeholder='Masukkan Total Kuantitas'
                                      value={
-                                        formik.values.cost_per_kandangs[
+                                        formik.values.expense_nonstocks[
                                          kandangExpenseIdx
                                        ].cost_items[expenseIdx].quantity ?? ''
                                      }
@@ -198,18 +198,17 @@ const ExpenseRequestKandangDetailExpense: React.FC<

                                  <td className='p-2'>
                                    <NumberInput
-                                      name={`cost_per_kandangs[${kandangExpenseIdx}].cost_items[${expenseIdx}].total_cost`}
-                                      placeholder='Masukkan Total Biaya'
+                                      name={`expense_nonstocks[${kandangExpenseIdx}].cost_items[${expenseIdx}].price`}
+                                      placeholder='Masukkan Harga Satuan'
                                      value={
-                                        formik.values.cost_per_kandangs[
+                                        formik.values.expense_nonstocks[
                                          kandangExpenseIdx
-                                        ].cost_items[expenseIdx].total_cost ??
-                                        ''
+                                        ].cost_items[expenseIdx].price ?? ''
                                      }
                                      onChange={formik.handleChange}
                                      onBlur={formik.handleBlur}
                                      isError={isExpenseRepeaterInputError(
-                                        'total_cost',
+                                        'price',
                                        kandangExpenseIdx,
                                        expenseIdx
                                      )}
@@ -224,10 +223,10 @@ const ExpenseRequestKandangDetailExpense: React.FC<

                                  <td className='p-2'>
                                    <TextInput
-                                      name={`cost_per_kandangs[${kandangExpenseIdx}].cost_items[${expenseIdx}].notes`}
+                                      name={`expense_nonstocks[${kandangExpenseIdx}].cost_items[${expenseIdx}].notes`}
                                      placeholder='Tuliskan catatan'
                                      value={
-                                        formik.values.cost_per_kandangs[
+                                        formik.values.expense_nonstocks[
                                          kandangExpenseIdx
                                        ].cost_items[expenseIdx].notes ?? ''
                                      }
@@ -224,7 +224,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
    { label: 'Vendor', value: expense?.supplier.name },
    {
      label: 'Tanggal Transaksi',
-      value: formatDate(expense?.expense_date, 'DD MMMM YYYY'),
+      value: formatDate(expense?.transaction_date, 'DD MMMM YYYY'),
    },
    {
      label: 'Tanggal Realisasi',
@@ -326,7 +326,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
            let expenseRequestTotal = 0;

            kandangExpense.pengajuans?.forEach(
-              (item) => (expenseRequestTotal += item.total_price)
+              (item) => (expenseRequestTotal += item.price)
            );

            return (
@@ -374,7 +374,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
                      <Text
                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
                      >
-                        Total Biaya
+                        Harga Satuan
                      </Text>
                    </View>
                    <View
@@ -424,7 +424,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
                        ]}
                      >
                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
-                          {formatCurrency(pengajuan.total_price)}
+                          {formatCurrency(pengajuan.price)}
                        </Text>
                      </View>
                      <View
@@ -484,7 +484,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
            let expenseRealizationTotal = 0;

            kandangExpense.realisasi?.forEach(
-              (item) => (expenseRealizationTotal += item.total_price)
+              (item) => (expenseRealizationTotal += item.price)
            );

            return (
@@ -532,7 +532,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
                      <Text
                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
                      >
-                        Total Biaya
+                        Harga Satuan
                      </Text>
                    </View>
                    <View
@@ -582,7 +582,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
                        ]}
                      >
                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
-                          {formatCurrency(realisasi.total_price)}
+                          {formatCurrency(realisasi.price)}
                        </Text>
                      </View>
                      <View
@@ -6,7 +6,7 @@ import Table from '@/components/Table';
 import { ROWS_OPTIONS } from '@/config/constant';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { cn } from '@/lib/helper';
-import { inventoryAdjustmentApi } from '@/services/api/inventory';
+import { InventoryAdjustmentApi } from '@/services/api/inventory';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
 import { InventoryAdjustment } from '@/types/api/inventory/adjustment';
 import { Icon } from '@iconify/react';
@@ -41,8 +41,8 @@ const InventoryAdjustmentTable = () => {

  // Fetch Data
  const { data: inventoryAdjustments, isLoading } = useSWR(
-    `${inventoryAdjustmentApi.basePath}${getTableFilterQueryString()}`,
-    inventoryAdjustmentApi.getAllFetcher
+    `${InventoryAdjustmentApi.basePath}${getTableFilterQueryString()}`,
+    InventoryAdjustmentApi.getAllFetcher
  );

  // State
@@ -1,7 +1,7 @@
 'use client';

 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { inventoryAdjustmentApi } from '@/services/api/inventory';
+import { InventoryAdjustmentApi } from '@/services/api/inventory';
 import {
  CreateInventoryAdjustmentPayload,
  InventoryAdjustment,
@@ -24,7 +24,7 @@ import Button from '@/components/Button';
 import { Icon } from '@iconify/react';
 import SelectInput, { OptionType } from '@/components/input/SelectInput';
 import TextInput from '@/components/input/TextInput';
-import RadioInput from '@/components/input/RadioInput';
+import { RadioGroup } from '@/components/input/RadioInput';
 import TextArea from '@/components/input/TextArea';

 interface InventoryAdjustmentFormProps {
@@ -52,7 +52,7 @@ const InventoryAdjustmentForm = ({
  const createInventoryAdjustmentHandler = useCallback(
    async (payload: CreateInventoryAdjustmentPayload) => {
      const createInventoryAdjustmentRes =
-        await inventoryAdjustmentApi.create(payload);
+        await InventoryAdjustmentApi.create(payload);

      if (isResponseError(createInventoryAdjustmentRes)) {
        setInventoryAdjustmentFormErrorMessage(
@@ -347,7 +347,7 @@ const InventoryAdjustmentForm = ({
            />

            {/* Radio Button Flag Stock */}
-            <RadioInput
+            <RadioGroup
              name='transaction_type'
              label='Tipe Transaksi'
              options={[
@@ -367,7 +367,7 @@ const InventoryAdjustmentForm = ({
                Boolean(formik.errors.transaction_type)
              }
              errorMessage={formik.errors.transaction_type as string}
-              variant='radio-primary'
+              color='primary'
              required
              bottomLabel={
                formik.values.transaction_type == undefined
@@ -0,0 +1,233 @@
+'use client';
+
+import Button from '@/components/Button';
+import DebouncedTextInput from '@/components/input/DebouncedTextInput';
+import SelectInput, { OptionType } from '@/components/input/SelectInput';
+import Table from '@/components/Table';
+import RowCollapseOptions from '@/components/table/RowCollapseOptions';
+import RowDropdownOptions from '@/components/table/RowDropdownOptions';
+import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
+import { ROWS_OPTIONS } from '@/config/constant';
+import { isResponseSuccess } from '@/lib/api-helper';
+import { cn, formatCurrency, formatNumber } from '@/lib/helper';
+import { InventoryProductApi } from '@/services/api/inventory';
+import { useTableFilter } from '@/services/hooks/useTableFilter';
+import { InventoryProduct } from '@/types/api/inventory/product';
+import { Icon } from '@iconify/react';
+import {
+  CellContext,
+  ColumnDef,
+  Row,
+  SortingState,
+} from '@tanstack/react-table';
+import { ChangeEventHandler, useMemo, useState } from 'react';
+import useSWR from 'swr';
+
+const RowOptionsMenu = ({
+  type = 'dropdown',
+  props,
+}: {
+  type: 'dropdown' | 'collapse';
+  props: CellContext<InventoryProduct, unknown>;
+}) => (
+  <RowOptionsMenuWrapper type={type}>
+    <Button
+      href={`/inventory/product/detail?inventoryProductId=${props.row.original.id}`}
+      variant='ghost'
+      color='primary'
+      className='justify-start text-sm'
+    >
+      <Icon icon='mdi:eye-outline' width={16} height={16} />
+      Detail
+    </Button>
+  </RowOptionsMenuWrapper>
+);
+
+const InventoryProductTable = () => {
+  const {
+    state: tableFilterState,
+    updateFilter,
+    setPage,
+    setPageSize,
+    toQueryString: getTableFilterQueryString,
+  } = useTableFilter({
+    initial: {
+      search: '',
+    },
+    paramMap: {
+      page: 'page',
+      pageSize: 'limit',
+    },
+  });
+
+  const [sorting, setSorting] = useState<SortingState>([]);
+
+  const { data: inventoryProducts, isLoading } = useSWR(
+    `${InventoryProductApi.basePath}${getTableFilterQueryString()}`,
+    InventoryProductApi.getAllFetcher
+  );
+
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    updateFilter('search', e.target.value);
+  };
+
+  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+    const newVal = val as OptionType;
+    setPageSize(newVal.value as number);
+    setPage(1);
+  };
+
+  const columns: ColumnDef<InventoryProduct>[] = useMemo(
+    () => [
+      {
+        header: '#',
+        cell: (props) =>
+          tableFilterState.pageSize * (tableFilterState.page - 1) +
+          props.row.index +
+          1,
+      },
+      {
+        accessorKey: 'name',
+        header: 'Nama',
+      },
+      {
+        accessorKey: 'product_price',
+        header: 'Harga Beli',
+        cell: (props) => {
+          return props.row.original.product_price
+            ? formatCurrency(props.row.original.product_price)
+            : '-';
+        },
+      },
+      {
+        accessorKey: 'selling_price',
+        header: 'Harga Jual',
+        cell: (props) => {
+          return props.row.original.selling_price
+            ? formatCurrency(props.row.original.selling_price)
+            : '-';
+        },
+      },
+      {
+        accessorFn: (row) => row.product_category.name,
+        header: 'Kategori',
+      },
+      {
+        accessorFn: (row) => row.total_stock,
+        header: 'Stok',
+        cell: (props) => {
+          return props.row.original.total_stock
+            ? formatNumber(props.row.original.total_stock)
+            : '0';
+        },
+      },
+      {
+        accessorFn: (row) => row.uom.name,
+        header: 'Satuan',
+      },
+      {
+        header: 'Aksi',
+        cell: (props) => {
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
+          const currentPageRows = props.table.getPaginationRowModel().flatRows;
+          const currentRowRelativeIndex =
+            currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
+
+          const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+
+          return (
+            <>
+              {currentPageSize > 2 && (
+                <RowDropdownOptions isLast2Rows={isLast2Rows}>
+                  <RowOptionsMenu type='dropdown' props={props} />
+                </RowDropdownOptions>
+              )}
+
+              {currentPageSize <= 2 && (
+                <RowCollapseOptions>
+                  <RowOptionsMenu type='collapse' props={props} />
+                </RowCollapseOptions>
+              )}
+            </>
+          );
+        },
+      },
+    ],
+    []
+  );
+
+  return (
+    <>
+      <div className='w-full p-0 sm:p-4'>
+        <div className='flex flex-col gap-2 mb-4'>
+          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+            <div className='w-full flex flex-row gap-2'></div>
+          </div>
+
+          <div className='flex justify-between items-end gap-4'>
+            <DebouncedTextInput
+              name='search'
+              placeholder='Cari Produk'
+              value={tableFilterState.search}
+              onChange={searchChangeHandler}
+              className={{ wrapper: 'sm:max-w-3xs' }}
+            />
+            <SelectInput
+              label='Baris'
+              options={ROWS_OPTIONS}
+              value={{
+                label: String(tableFilterState.pageSize),
+                value: tableFilterState.pageSize,
+              }}
+              onChange={pageSizeChangeHandler}
+              className={{
+                wrapper:
+                  'col-span-6 sm:col-span-4 max-w-28 sm:justify-self-end',
+              }}
+            />
+          </div>
+        </div>
+
+        <Table<InventoryProduct>
+          data={
+            isResponseSuccess(inventoryProducts) ? inventoryProducts?.data : []
+          }
+          columns={columns}
+          pageSize={tableFilterState.pageSize}
+          page={
+            isResponseSuccess(inventoryProducts)
+              ? inventoryProducts?.meta?.page
+              : 0
+          }
+          totalItems={
+            isResponseSuccess(inventoryProducts)
+              ? inventoryProducts?.meta?.total_results
+              : 0
+          }
+          onPageChange={setPage}
+          isLoading={isLoading}
+          sorting={sorting}
+          setSorting={setSorting}
+          className={{
+            containerClassName: cn({
+              'mb-20':
+                isResponseSuccess(inventoryProducts) &&
+                inventoryProducts?.data?.length === 0,
+            }),
+            tableWrapperClassName: 'overflow-x-auto min-h-full!',
+            tableClassName: 'font-inter w-full table-auto min-h-full!',
+            headerRowClassName: 'border-b border-b-gray-200',
+            headerColumnClassName:
+              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
+            bodyRowClassName: 'border-b border-b-gray-200',
+            bodyColumnClassName:
+              'px-6 py-3 last:flex last:flex-row last:justify-end',
+          }}
+        />
+      </div>
+    </>
+  );
+};
+
+export default InventoryProductTable;
@@ -0,0 +1,118 @@
+import Card from '@/components/Card';
+import { FormHeader } from '@/components/helper/form/FormHeader';
+import StockLogTable from '@/components/pages/inventory/product/detail/StockLogTable';
+import StockProductWarehouseTable from '@/components/pages/inventory/product/detail/StockProductWarehouseTable';
+import { formatCurrency, formatNumber } from '@/lib/helper';
+import { InventoryProduct } from '@/types/api/inventory/product';
+import { useMemo } from 'react';
+
+const InventoryProductDetail = ({
+  inventoryProduct,
+}: {
+  inventoryProduct?: InventoryProduct;
+}) => {
+  const stockLogs = useMemo(() => {
+    return (
+      inventoryProduct?.product_warehouses?.flatMap(
+        (warehouse) => warehouse.stock_logs || []
+      ) || []
+    );
+  }, [inventoryProduct]);
+
+  return (
+    <div className='flex flex-col gap-4 p-4'>
+      <FormHeader
+        title='Detail Persediaan Produk'
+        backUrl='/inventory/product'
+      />
+
+      <Card
+        title='Informasi Produk'
+        variant='bordered'
+        className={{
+          wrapper: 'w-full mt-4',
+        }}
+      >
+        <div className='grid grid-cols-2 gap-4'>
+          <div className='overflow-x-auto rounded-box border border-base-content/5 bg-base-100 mt-3'>
+            <table className='table'>
+              <tbody>
+                <tr>
+                  <td className='font-semibold'>SKU</td>
+                  <td>:</td>
+                  <td>{inventoryProduct?.sku}</td>
+                </tr>
+                <tr>
+                  <td className='font-semibold'>Nama Produk</td>
+                  <td>:</td>
+                  <td>{inventoryProduct?.name}</td>
+                </tr>
+                <tr>
+                  <td className='font-semibold'>Kategory</td>
+                  <td>:</td>
+                  <td>{inventoryProduct?.product_category.name}</td>
+                </tr>
+                <tr>
+                  <td className='font-semibold'>Satuan</td>
+                  <td>:</td>
+                  <td>{inventoryProduct?.uom.name}</td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+
+          <div className='overflow-x-auto rounded-box border border-base-content/5 bg-base-100 mt-3'>
+            <table className='table'>
+              <tbody>
+                <tr>
+                  <td className='font-semibold'>Harga Jual</td>
+                  <td>:</td>
+                  <td>
+                    {inventoryProduct?.selling_price
+                      ? formatCurrency(inventoryProduct.selling_price)
+                      : '-'}
+                  </td>
+                </tr>
+                <tr>
+                  <td className='font-semibold'>Harga Beli</td>
+                  <td>:</td>
+                  <td>
+                    {inventoryProduct?.product_price
+                      ? formatCurrency(inventoryProduct?.product_price)
+                      : '-'}
+                  </td>
+                </tr>
+                <tr>
+                  <td className='font-semibold'>Pajak</td>
+                  <td>:</td>
+                  <td>
+                    {inventoryProduct?.tax
+                      ? formatCurrency(inventoryProduct?.tax)
+                      : '-'}
+                  </td>
+                </tr>
+                <tr>
+                  <td className='font-semibold'>Total Stok</td>
+                  <td>:</td>
+                  <td>
+                    {inventoryProduct?.total_stock
+                      ? formatNumber(inventoryProduct?.total_stock)
+                      : '0'}
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </Card>
+
+      <StockProductWarehouseTable
+        productWarehouseStock={inventoryProduct?.product_warehouses ?? []}
+      />
+
+      <StockLogTable stockLogs={stockLogs} />
+    </div>
+  );
+};
+
+export default InventoryProductDetail;
@@ -0,0 +1,81 @@
+import Card from '@/components/Card';
+import Table from '@/components/Table';
+import { formatDate, formatNumber, formatTitleCase } from '@/lib/helper';
+import { StockLog } from '@/types/api/inventory/product';
+
+const StockLogTable = ({ stockLogs }: { stockLogs: StockLog[] }) => {
+  return (
+    <Card
+      title='Informasi Stock Produk'
+      collapsible
+      variant='bordered'
+      className={{
+        wrapper: 'w-full',
+      }}
+    >
+      <Table<StockLog>
+        data={stockLogs}
+        columns={[
+          {
+            header: 'ID',
+            accessorKey: 'id',
+          },
+          {
+            header: 'Tanggal',
+            accessorKey: 'created_at',
+            cell: (props) => {
+              return formatDate(props.row.original.created_at, 'DD-MMM-yyyy');
+            },
+          },
+          {
+            header: 'Peningkatan',
+            accessorKey: 'increase',
+            cell: (props) => {
+              return formatNumber(props.row.original.increase);
+            },
+          },
+          {
+            header: 'Penurunan',
+            accessorKey: 'decrease',
+            cell: (props) => {
+              return formatNumber(props.row.original.decrease);
+            },
+          },
+          {
+            header: 'Jenis Transaksi',
+            accessorKey: 'loggable_type',
+            cell: (props) => {
+              return props.row.original.loggable_type
+                ? formatTitleCase(props.row.original.loggable_type)
+                : '-';
+            },
+          },
+          {
+            header: 'Catatan',
+            accessorKey: 'notes',
+            cell: (props) => {
+              return props.row.original.notes ? props.row.original.notes : '-';
+            },
+          },
+          {
+            header: 'Oleh',
+            accessorKey: 'created_user.name',
+          },
+        ]}
+        className={{
+          containerClassName: 'mt-6',
+          tableWrapperClassName: 'overflow-x-auto min-h-full!',
+          tableClassName: 'font-inter w-full table-auto min-h-full!',
+          headerRowClassName: 'border-b border-b-gray-200',
+          headerColumnClassName:
+            'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
+          bodyRowClassName: 'border-b border-b-gray-200',
+          bodyColumnClassName:
+            'px-6 py-3 last:flex last:flex-row last:justify-end',
+        }}
+      />
+    </Card>
+  );
+};
+
+export default StockLogTable;
@@ -0,0 +1,65 @@
+import Card from '@/components/Card';
+import Table from '@/components/Table';
+import { formatNumber } from '@/lib/helper';
+import {
+  InventoryProduct,
+  ProductWarehouseStock,
+} from '@/types/api/inventory/product';
+
+const StockProductWarehouseTable = ({
+  productWarehouseStock,
+}: {
+  productWarehouseStock?: ProductWarehouseStock[];
+}) => {
+  return (
+    <Card
+      title='Informasi Gudang'
+      collapsible
+      variant='bordered'
+      className={{
+        wrapper: 'w-full',
+      }}
+    >
+      <Table<ProductWarehouseStock>
+        data={productWarehouseStock ?? []}
+        columns={[
+          {
+            header: 'Nama Gudang',
+            accessorKey: 'warehouse_name',
+          },
+          {
+            header: 'Lokasi',
+            accessorKey: 'location',
+            cell: (props) => {
+              return props.row.original.location != null
+                ? props.row.original.location.name
+                : '-';
+            },
+          },
+          {
+            header: 'Stok',
+            accessorFn(row) {
+              return row.current_stock;
+            },
+            cell: (props) => {
+              return formatNumber(props.row.original.current_stock);
+            },
+          },
+        ]}
+        className={{
+          containerClassName: 'mt-6',
+          tableWrapperClassName: 'overflow-x-auto min-h-full!',
+          tableClassName: 'font-inter w-full table-auto min-h-full!',
+          headerRowClassName: 'border-b border-b-gray-200',
+          headerColumnClassName:
+            'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
+          bodyRowClassName: 'border-b border-b-gray-200',
+          bodyColumnClassName:
+            'px-6 py-3 last:flex last:flex-row last:justify-end',
+        }}
+      />
+    </Card>
+  );
+};
+
+export default StockProductWarehouseTable;
@@ -6,7 +6,7 @@ import {
 import {
  DeliveryOrderProductFormValues,
  DeliveryOrderProductSchema,
-} from './repeater/delivery-order/DeliverOrderProduct.schema';
+} from '@/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.schema';

 type MarketingSchemaType = {
  customer_id: number | undefined;
@@ -8,7 +8,6 @@ import SelectInput, {
  OptionType,
  useSelect,
 } from '@/components/input/SelectInput';
-import TextArea from '@/components/input/TextArea';
 import Modal, { useModal } from '@/components/Modal';
 import { formatCurrency, formatDate } from '@/lib/helper';
 import {
@@ -31,23 +30,23 @@ import {
  DeliveryOrderSchema,
  SalesOrderFormValues,
  SalesOrderSchema,
-} from './MarketingForm.schema';
+} from '@/components/pages/marketing/form/MarketingForm.schema';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import {
  DeliveryOrderApi,
  MarketingApi,
  SalesOrderApi,
 } from '@/services/api/marketing/marketing';
-import { SalesOrderProductFormValues } from './repeater/sales-order/SalesOrderProduct.schema';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import toast from 'react-hot-toast';
 import { useRouter } from 'next/navigation';
-import SalesOrderProductTable from './table-view/SalesOrderProductTable';
-import SalesOrderProductForm from './repeater/sales-order/SalesOrderProductForm';
-import DeliveryOrderProductTable from './table-view/DeliveryOrderProductTable';
-import DeliveryOrderProductForm from './repeater/delivery-order/DeliverOrderProduct';
-import { DeliveryOrderProductFormValues } from './repeater/delivery-order/DeliverOrderProduct.schema';
 import DebouncedTextArea from '@/components/input/DebouncedTextArea';
+import SalesOrderProductTable from '@/components/pages/marketing/form/table-view/SalesOrderProductTable';
+import SalesOrderProductForm from '@/components/pages/marketing/form/repeater/sales-order/SalesOrderProductForm';
+import DeliveryOrderProductTable from '@/components/pages/marketing/form/table-view/DeliveryOrderProductTable';
+import DeliveryOrderProductForm from '@/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct';
+import { SalesOrderProductFormValues } from '@/components/pages/marketing/form/repeater/sales-order/SalesOrderProduct.schema';
+import { DeliveryOrderProductFormValues } from '@/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.schema';

 const MemoizedSalesOrderProductTable = memo(SalesOrderProductTable);
 const MemoizedSalesOrderProductForm = memo(SalesOrderProductForm);
@@ -156,8 +155,6 @@ export const recalculate = (
  field: string,
  values: ProductCalculationFields
 ) => {
-  console.log('Values');
-  console.log(values);
  const { qty, unit_price, total_price, avg_weight, total_weight } = values;
  const result: Partial<ProductCalculationFields> = {};
  if (field == 'unit_price' || field == 'total_price' || field == 'qty') {
@@ -174,8 +171,6 @@ export const recalculate = (
      result.avg_weight = Number(total_weight) / Number(qty);
    }
  }
-  console.log('Result');
-  console.log(result);
  return result;
 };
 export const getSubmitField = (values: ProductCalculationFields) => {
@@ -327,8 +322,6 @@ const MarketingForm = ({
                })
                .filter((item) => Boolean(item)),
            } as UpdateDeliveryOrderPayload);
-      console.log('PAYLOAD');
-      console.log(payload);
      switch (formType) {
        case 'add':
          await createMarketingHandler(payload as CreateSalesOrderPayload);
@@ -352,7 +345,6 @@ const MarketingForm = ({
  // ================== FORM REPEATER HANDLER ==================
  const createMarketingHandler = async (values: CreateSalesOrderPayload) => {
    setIsLoading(true);
-    console.log(values);
    const createMarketingRes = await SalesOrderApi.create(values);
    if (isResponseSuccess(createMarketingRes)) {
      toast.success(createMarketingRes?.message as string);
@@ -365,7 +357,6 @@ const MarketingForm = ({
  };
  const updateMarketingHandler = async (values: UpdateSalesOrderPayload) => {
    setIsLoading(true);
-    console.log(values);
    const updateMarketingRes = await SalesOrderApi.update(
      initialValues?.id as number,
      values
@@ -381,10 +372,8 @@ const MarketingForm = ({
  };
  const createDeliveryHandler = async (values: CreateDeliveryOrderPayload) => {
    setIsLoading(true);
-    console.log(initialValues?.id);
    const createDeliveryRes = await DeliveryOrderApi.create(values);
    if (isResponseSuccess(createDeliveryRes)) {
-      console.log(createDeliveryRes);
      toast.success(createDeliveryRes?.message as string);
      setDeliveryOrderValues(
        createDeliveryRes.data?.delivery_order?.flatMap((delivery) =>
@@ -397,20 +386,17 @@ const MarketingForm = ({
      router.push(`/marketing/detail?marketingId=${initialValues?.id}`);
    }
    if (isResponseError(createDeliveryRes)) {
-      console.log(createDeliveryRes);
      toast.error(createDeliveryRes?.message as string);
    }
    setIsLoading(false);
  };
  const updateDeliveryHandler = async (values: UpdateDeliveryOrderPayload) => {
    setIsLoading(true);
-    console.log(initialValues?.id);
    const updateDeliveryRes = await DeliveryOrderApi.update(
      initialValues?.id as number,
      values
    );
    if (isResponseSuccess(updateDeliveryRes)) {
-      console.log(updateDeliveryRes);
      toast.success(updateDeliveryRes?.message as string);
      setDeliveryOrderValues(
        mergeSOwithDO(
@@ -426,7 +412,6 @@ const MarketingForm = ({
      router.push(`/marketing/detail?marketingId=${initialValues?.id}`);
    }
    if (isResponseError(updateDeliveryRes)) {
-      console.log(updateDeliveryRes);
      toast.error(updateDeliveryRes?.message as string);
    }
    setIsLoading(false);
@@ -435,16 +420,13 @@ const MarketingForm = ({
  // ================== MARKETING HANDLER ==================
  const deleteMarketingHandler = async () => {
    setIsLoading(true);
-    console.log(initialValues?.id);
    const deleteMarketingRes = await MarketingApi.delete(
      initialValues?.id as number
    );
    if (isResponseSuccess(deleteMarketingRes)) {
-      console.log(deleteMarketingRes);
      toast.success(deleteMarketingRes?.message as string);
    }
    if (isResponseError(deleteMarketingRes)) {
-      console.log(deleteMarketingRes);
      toast.error(deleteMarketingRes?.message as string);
    }
    setIsLoading(false);
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
 import {
  DeliveryOrderProductFormValues,
  DeliveryOrderProductSchema,
-} from './DeliverOrderProduct.schema';
+} from '@/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.schema';
 import { useFormik } from 'formik';
 import Alert from '@/components/Alert';
 import Button from '@/components/Button';
@@ -3,10 +3,10 @@ import { BaseDeliveryOrder, Marketing } from '@/types/api/marketing/marketing';
 import { Icon } from '@iconify/react';
 import { Document, Image, Page, pdf, Text, View } from '@react-pdf/renderer';
 import { useMemo, useState } from 'react';
-import pdfStyles from './styles/MarketingPDFStyles';
 import { formatDate, formatNumber, formatVechicleNumber } from '@/lib/helper';
 import { format } from 'path';
 import { date } from 'yup';
+import pdfStyles from '@/components/pages/marketing/pdf/styles/MarketingPDFStyles';

 interface DeliveryOrderExportProps {
  data?: Marketing;
@@ -3,8 +3,8 @@ import { Marketing } from '@/types/api/marketing/marketing';
 import { Icon } from '@iconify/react';
 import { Document, Image, Page, pdf, Text, View } from '@react-pdf/renderer';
 import { useMemo, useState } from 'react';
-import pdfStyles from './styles/MarketingPDFStyles';
 import { formatDate, formatNumber } from '@/lib/helper';
+import pdfStyles from '@/components/pages/marketing/pdf/styles/MarketingPDFStyles';

 interface SalesOrderExportProps {
  data?: Marketing;
@@ -306,7 +306,6 @@ const SupplierForm = ({
              label='Hatchery'
              value={hatcheryOptionsValues}
              onChange={(val) => {
-                console.log(val); // pastikan val = array of { value, label }
                setHatcheryOptionValues(val as OptionType[]);
              }}
              isError={
@@ -7,13 +7,16 @@ import { formatNumber } from '@/lib/helper';
 import { Kandang } from '@/types/api/master-data/kandang';
 import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
 import Tabs from '@/components/Tabs';
-import ChickinFormView from './tabs/ChickinFormView';
-import ChickinLogsView from './tabs/ChickLogsView';
 import { useState } from 'react';
 import ApprovalSteps, {
  useApprovalSteps,
 } from '@/components/pages/ApprovalSteps';
 import { PROJECT_FLOCK_KANDANG_APPROVAL_LINE } from '@/config/approval-line';
+import ChickinFormView from '@/components/pages/production/chickin/form/tabs/ChickinFormView';
+import ChickinLogsView from '@/components/pages/production/chickin/form/tabs/ChickLogsView';
+import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
+import { Icon } from '@iconify/react';
+import Badge from '@/components/Badge';
 const ChickinFormKandang = ({
  formType = 'add',
  initialValues,
@@ -23,7 +26,7 @@ const ChickinFormKandang = ({
  initialValues: ProjectFlockKandang;
  afterSubmit?: () => void;
 }) => {
-  const [activeTabId, setActiveTabId] = useState<string>('formChickIn');
+  const [openChickin, setOpenChickin] = useState<boolean>(false);

  const {
    approvals,
@@ -37,108 +40,148 @@ const ChickinFormKandang = ({
  });

  const afterSubmitFormChickin = () => {
-    setActiveTabId('logsChickIn');
+    setOpenChickin(true);
    afterSubmit && afterSubmit();
    refreshApprovals();
  };

  return (
-    <div className='flex flex-col gap-4'>
-      <FormHeader
-        title={`Chick In ${initialValues.kandang?.name ?? 'Kandang'}`}
-        backUrl={`/production/project-flock/chickin/add?projectFlockId=${initialValues?.project_flock?.id}`}
+    <>
+      <DrawerHeader
+        subtitle={`Chick In ${initialValues.kandang?.name ?? 'Kandang'}`}
+        leftIcon='mdi:arrow-left'
+        leftIconHref={`/production/project-flock/detail?projectFlockId=${initialValues?.project_flock?.id}`}
      />

+      {/* Informasi Kandang */}
+      <div className='divider'></div>
+      <div className='px-4 pb-4 flex flex-col gap-4'>
+        <h2 className='text-xl font-semibold'>Informasi Kandang</h2>
+
        {approvals && !approvalsLoading && (
+          <div className='mb-3 text-sm'>
            <ApprovalSteps approvals={approvals} />
+          </div>
        )}

-      <Card
-        title='Informasi Kandang'
+        {/* Badge Row */}
+        <div className='flex flex-row gap-2'>
+          <Badge
+            variant='soft'
+            color='success'
            className={{
-          wrapper: 'w-full bg-white mt-4',
+              badge: 'rounded-lg px-2',
            }}
          >
-        <Table<Kandang>
-          emptyContent={
-            <div className='w-full p-5 text-center'>
-              <span className='text-lg opacity-50'>
-                Informasi Kandang belum tersedia...
-              </span>
+            <Icon icon='mdi:circle' width={12} height={12} color='success' />{' '}
+            Aktif
+          </Badge>
+          <div className='divider divider-horizontal p-0 m-0'></div>
+          <Badge
+            color='neutral'
+            variant='soft'
+            className={{ badge: 'rounded-lg px-2' }}
+          >
+            <Icon icon='mdi:home' width={12} height={12} />
+            {` Kapasitas ${formatNumber(initialValues.kandang.capacity)} Ekor`}
+          </Badge>
        </div>
-          }
-          data={[initialValues?.kandang]}
-          columns={[
-            {
-              header: 'Area',
-              accessorFn: () => initialValues?.project_flock?.area.name || '-',
-            },
-            {
-              header: 'Lokasi',
-              accessorFn: () =>
-                initialValues?.project_flock?.location.name || '-',
-            },
-            {
-              header: 'Flock',
-              accessorFn: () => initialValues?.project_flock?.flock_name || '-',
-            },
-            {
-              header: 'Kandang',
-              accessorFn: (row) => row?.name || '-',
-            },
-            {
-              header: 'Kapasitas',
-              accessorFn: (row) =>
-                (row?.capacity && formatNumber(row?.capacity)) || '-',
-            },
-            {
-              header: 'Penanggung Jawab',
-              accessorFn: (row) => row?.pic?.name || '-',
-            },
-          ]}
+
+        {/* Information Grid */}
+        <div className='grid grid-cols-3 gap-4'>
+          {/* Area */}
+          <div
+            className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
+        relative 
+        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
+          >
+            <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Area
+          </div>
+          <div className='col-span-2'>
+            {initialValues.project_flock.area.name}
+          </div>
+
+          {/* Lokasi */}
+          <div
+            className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
+        relative 
+        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
+          >
+            <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Lokasi
+          </div>
+          <div className='col-span-2'>
+            {initialValues.project_flock?.location.name}
+          </div>
+
+          {/* Kandang */}
+          <div
+            className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
+        relative 
+        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
+          >
+            <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Kandang
+          </div>
+          <div className='col-span-2'>{initialValues.kandang.name}</div>
+
+          {/* Jumlah DOC */}
+          <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
+            <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Jumlah DOC
+          </div>
+          <div className='col-span-2'>
+            {formatNumber(
+              initialValues.chickins?.reduce(
+                (total, chickin) => total + chickin.usage_qty,
+                0
+              ) ?? 0
+            )}{' '}
+            Ekor
+          </div>
+        </div>
+      </div>
+
+      <div className='divider'></div>
+      <div className='px-4 pb-4 flex flex-col gap-4'>
+        <h2 className='text-xl font-semibold'>Informasi Chick In</h2>
+        {/* Badge Row  */}
+        <div className='flex flex-row gap-2'>
+          <Badge
+            variant='soft'
+            color={'success'}
            className={{
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
-            paginationClassName: 'hidden',
+              badge: 'rounded-lg px-2',
            }}
+          >
+            <Icon icon='mdi:circle' width={12} height={12} color={'success'} />{' '}
+            Perlu Chick In ({initialValues.available_qtys?.length ?? 0})
+          </Badge>
+          <div className='divider divider-horizontal p-0 m-0'></div>
+          <Badge
+            color='neutral'
+            variant='soft'
+            className={{ badge: 'rounded-lg px-2 cursor-pointer' }}
+            onClick={() => setOpenChickin(!openChickin)}
+          >
+            {`Riwayat Chick In ${formatNumber(initialValues.chickins?.length ?? 0)}`}
+            <Icon
+              icon={`mdi:${openChickin ? 'eye' : 'eye-off'}`}
+              width={12}
+              height={12}
            />
-      </Card>
-      <Tabs
-        className='bg-white p-2'
-        onTabChange={setActiveTabId}
-        activeTabId={activeTabId}
-        tabs={[
-          {
-            id: 'formChickIn',
-            label: 'Tambah Chick In',
-            content: (
+          </Badge>
+        </div>
+      </div>
+      {openChickin && (
+        <ChickinLogsView
+          initialValues={initialValues}
+          afterSubmit={afterSubmitFormChickin}
+        />
+      )}
      <ChickinFormView
        initialValues={initialValues}
        formType={formType}
        afterSubmit={afterSubmitFormChickin}
      />
-            ),
-          },
-          {
-            content: (
-              <ChickinLogsView
-                initialValues={initialValues}
-                afterSubmit={afterSubmitFormChickin}
-              />
-            ),
-            id: 'logsChickIn',
-            label: 'Riwayat Chick In',
-          },
-        ]}
-        variant='lifted'
-      />
-    </div>
+    </>
  );
 };

@@ -2,17 +2,12 @@ import Alert from '@/components/Alert';
 import Button from '@/components/Button';
 import Card from '@/components/Card';
 import { useModal } from '@/components/Modal';
-import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
 import PillBadge from '@/components/PillBadge';
-import Table from '@/components/Table';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { cn, formatDate, formatNumber } from '@/lib/helper';
+import { formatDate, formatNumber } from '@/lib/helper';
 import { ChickinApi } from '@/services/api/production/chickin';
-import {
-  Chickin,
-  ProjectFlockKandang,
-} from '@/types/api/production/project-flock-kandang';
+import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
 import { Icon } from '@iconify/react';
 import { useState } from 'react';
 import toast from 'react-hot-toast';
@@ -54,105 +49,120 @@ const ChickinLogsView = ({

  return (
    <>
+      <div className='px-4 pb-4 flex flex-col gap-4'>
+        {/* Card List Chickin Logs */}
+        {(initialValues?.chickins || []).length === 0 ? (
+          <div className='w-full p-8 text-center'>
+            <span className='text-lg opacity-50'>
+              Belum ada riwayat Chick In...
+            </span>
+          </div>
+        ) : (
+          (initialValues?.chickins || []).map((chickin, index) => {
+            const isApproved = chickin.usage_qty !== 0;
+            const isPending = chickin.pending_usage_qty !== 0;
+            const quantity = isApproved
+              ? chickin.usage_qty
+              : isPending
+                ? chickin.pending_usage_qty
+                : 0;
+
+            return (
              <Card
-        title='Riwayat Chick In'
+                key={chickin.id || index}
+                variant='bordered'
                className={{
-          wrapper: 'w-full bg-white',
+                  wrapper: 'w-full',
+                  body: 'p-3',
                }}
              >
-        <div className='flex flex-row justify-start gap-3 mt-3'>
+                <div className='flex flex-col gap-4'>
+                  {/* Header with Status Badge */}
+                  <div className='flex flex-row justify-between items-center'>
+                    <div className='text-lg font-semibold'>
+                      Chick In #{index + 1}
+                    </div>
+                    <PillBadge
+                      content={
+                        isApproved ? 'Disetujui' : isPending ? 'Pending' : '-'
+                      }
+                      color={
+                        isApproved ? 'green' : isPending ? 'yellow' : 'gray'
+                      }
+                    />
+                  </div>
+
+                  {/* Tanggal Chick In */}
+                  <div className='flex flex-row justify-between items-center'>
+                    <div className='flex flex-row gap-2 items-center text-gray-400'>
+                      <Icon icon={'mdi:calendar'} width={14} height={14} />{' '}
+                      <span>Tanggal Chick In</span>
+                    </div>
+                    <div className='text-end text-gray-500'>
+                      {formatDate(chickin.chick_in_date, 'DD MMM YYYY')}
+                    </div>
+                  </div>
+
+                  {/* Kandang */}
+                  <div className='flex flex-row justify-between items-center'>
+                    <div className='flex flex-row gap-2 items-center text-gray-400'>
+                      <Icon icon={'mdi:home'} width={14} height={14} />{' '}
+                      <span>Kandang</span>
+                    </div>
+                    <div className='text-end text-gray-500'>
+                      {chickin.product_warehouse?.warehouse?.name || '-'}
+                    </div>
+                  </div>
+
+                  {/* Produk */}
+                  <div className='flex flex-row justify-between items-center'>
+                    <div className='flex flex-row gap-2 items-center text-gray-400'>
+                      <Icon
+                        icon={'mdi:package-variant'}
+                        width={14}
+                        height={14}
+                      />{' '}
+                      <span>Produk</span>
+                    </div>
+                    <div className='text-end text-gray-500'>
+                      {chickin.product_warehouse?.product?.name || '-'}
+                    </div>
+                  </div>
+
+                  {/* Jumlah Chick In */}
+                  <div className='flex flex-row justify-between items-center'>
+                    <div className='flex flex-row gap-2 items-center text-gray-400'>
+                      <Icon icon={'mdi:counter'} width={14} height={14} />{' '}
+                      <span>Jumlah Chick In</span>
+                    </div>
+                    <div className='text-end text-gray-500 font-semibold'>
+                      {quantity > 0 ? `${formatNumber(quantity)} Ekor` : '-'}
+                    </div>
+                  </div>
+                </div>
+              </Card>
+            );
+          })
+        )}
+
        {initialValues?.approval?.step_number == 1 && (
          <Button
            color='success'
-              variant='outline'
            onClick={handleClickApprove}
+            className='w-full'
          >
            <Icon width={24} height={24} icon='material-symbols:check' />
-              Approve
+            Approve Semua Chick In
          </Button>
        )}
-        </div>
-        <Table<Chickin>
-          data={initialValues?.chickins || []}
-          columns={[
-            {
-              header: '#',
-              cell: (props) => props.row.index + 1,
-            },
-            {
-              accessorFn: (row) => row.chick_in_date,
-              header: 'Tanggal Chick In',
-              cell: (props) => {
-                return formatDate(props.getValue() as string, 'DD MMM YYYY');
-              },
-            },
-            {
-              accessorFn: (row) => row.product_warehouse?.warehouse?.name,
-              header: 'Kandang',
-            },
-            {
-              accessorFn: (row) => row.product_warehouse?.product?.name,
-              header: 'Produk',
-            },
-            {
-              accessorFn: (row) => row.usage_qty ?? row.pending_usage_qty,
-              header: 'Jumlah Chick In',
-              cell: (props) => {
-                if (props.row.original.usage_qty != 0) {
-                  return formatNumber(props.row.original.usage_qty);
-                } else if (props.row.original.pending_usage_qty != 0) {
-                  return formatNumber(props.row.original.pending_usage_qty);
-                } else {
-                  return '-';
-                }
-              },
-            },
-            {
-              accessorFn: (row) => row.pending_usage_qty,
-              header: 'Status',
-              cell: (props) => {
-                return (
-                  <PillBadge
-                    content={
-                      props.row.original.usage_qty !== 0
-                        ? 'Disetujui'
-                        : props.row.original.pending_usage_qty !== 0
-                          ? 'Pending'
-                          : '-'
-                    }
-                    color={
-                      props.row.original.usage_qty !== 0
-                        ? 'green'
-                        : props.row.original.pending_usage_qty !== 0
-                          ? 'yellow'
-                          : 'gray'
-                    }
-                  />
-                );
-              },
-            },
-          ]}
-          className={{
-            containerClassName: cn({
-              'mb-20': initialValues?.chickins?.length === 0,
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
-            paginationClassName: 'hidden',
-          }}
-        />
+
        {chickinErrorMessage && (
          <div className='w-full' onClick={() => setChickinErrorMessage('')}>
            <Alert color='error'>{chickinErrorMessage}</Alert>
          </div>
        )}
-      </Card>
+      </div>
+
      <ConfirmationModalWithNotes
        ref={confirmModal.ref}
        type='success'
@@ -20,6 +20,7 @@ import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandan
 import { useRouter } from 'next/navigation';
 import Alert from '@/components/Alert';
 import { formatNumber } from '@/lib/helper';
+import { Icon } from '@iconify/react';

 const ChickinFormView = ({
  initialValues,
@@ -118,19 +119,58 @@ const ChickinFormView = ({

  return (
    <form
-      className='flex flex-col gap-4'
+      className='flex flex-col gap-4 p-4'
      onReset={() => {
        handleReset();
      }}
      onSubmit={formik.handleSubmit}
    >
+      {(formik.values.chickin_requests || []).map((chickinRequest, index) => {
+        const availableQty = initialValues?.available_qtys?.find(
+          (availableQty) =>
+            availableQty.product_warehouse.id ===
+            chickinRequest.product_warehouse_id
+        );
+        return (
          <Card
-        title='Informasi Chick In DOC'
+            key={index}
+            // title={`${formatNumber(availableQty?.available_qty ?? 0)} Ekor - ${availableQty?.product_warehouse?.product?.name}`}
+            variant='bordered'
+            size='sm'
            className={{
-          wrapper: 'w-full bg-white',
+              wrapper: 'w-full',
+              body: 'p-3',
            }}
          >
-        <Table<ChickinRequestFormValues>
+            <div className='flex flex-row justify-between items-center'>
+              <div className='text-lg font-semibold'>
+                {formatNumber(availableQty?.available_qty ?? 0)} Ekor -{' '}
+                {availableQty?.product_warehouse?.product?.name}
+              </div>
+              {chickinRequest.chick_in_date && (
+                <Icon
+                  icon='mdi:check-circle-outline'
+                  color='success'
+                  className='text-success'
+                  width={20}
+                  height={20}
+                />
+              )}
+            </div>
+            <DateInput
+              className={{
+                wrapper: 'w-full',
+                inputWrapper: 'bg-white',
+              }}
+              label='Tanggal Chick In'
+              name={`chickin_requests[${index}].chick_in_date`}
+              value={chickinRequest.chick_in_date}
+              onChange={formik.handleChange}
+            />
+          </Card>
+        );
+      })}
+      {/* <Table<ChickinRequestFormValues>
        data={formik.values.chickin_requests || []}
        columns={[
          {
@@ -204,20 +244,17 @@ const ChickinFormView = ({
            </span>
          </div>
        }
-        />
-      </Card>
-      <div className='flex flex-row justify-center gap-3'>
-        <Button type='reset' color='warning' disabled={formik.isSubmitting}>
-          Reset
-        </Button>
+      /> */}
+      {formik.values.chickin_requests?.length > 0 && (
        <Button
          type='submit'
          color='primary'
          disabled={!formik.isValid || formik.isSubmitting}
        >
-          Submit
+          <Icon icon='mdi:checkbox-marked-outline' width={24} height={24} />
+          Chick In
        </Button>
-      </div>
+      )}
      {chickinErrorMessage && (
        <div className='w-full' onClick={() => setChickinErrorMessage('')}>
          <Alert color='error'>{chickinErrorMessage}</Alert>
@@ -1,6 +1,8 @@
 'use client';

+import Badge from '@/components/Badge';
 import Button from '@/components/Button';
+import FloatingActionsButton from '@/components/FloatingActionsButton';
 import CheckboxInput from '@/components/input/CheckboxInput';
 import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import SelectInput, { OptionType } from '@/components/input/SelectInput';
@@ -8,23 +10,18 @@ import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
 import Table from '@/components/Table';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
 import { ROWS_OPTIONS } from '@/config/constant';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { cn } from '@/lib/helper';
+import { cn, formatDate } from '@/lib/helper';
 import { AreaApi, KandangApi, LocationApi } from '@/services/api/master-data';
 import { ProjectFlockApi } from '@/services/api/production/project-flock';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { BaseApiResponse } from '@/types/api/api-general';
 import { Kandang } from '@/types/api/master-data/kandang';
-import {
-  ProjectFlockApprovalPayload,
-  ProjectFlock,
-} from '@/types/api/production/project-flock';
+import { ProjectFlock } from '@/types/api/production/project-flock';
 import { Icon } from '@iconify/react';
 import { CellContext, SortingState } from '@tanstack/react-table';
-import { ChangeEventHandler, useState } from 'react';
+import { useRouter } from 'next/navigation';
+import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
 import toast from 'react-hot-toast';
 import useSWR from 'swr';

@@ -98,7 +95,7 @@ const RowOptionsMenu = ({
  );
 };

-const ProjectFlockTable = () => {
+const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
  const {
    state: tableFilterState,
    updateFilter,
@@ -123,8 +120,9 @@ const ProjectFlockTable = () => {
      periodFilter: 'period',
    },
  });
+  const router = useRouter();

-  // State
+  // ===== State =====
  const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
  const selectedRowIds = Object.keys(rowSelection)
    .filter((id) => rowSelection[id])
@@ -151,14 +149,15 @@ const ProjectFlockTable = () => {
  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
  const [isApproveLoading, setIsApproveLoading] = useState(false);

-  // Fetch Data
+  // ===== Fetch Data =====
  const {
    data: projectFlocks,
    isLoading,
    mutate: refreshProjectFlocks,
  } = useSWR(
    `${ProjectFlockApi.basePath}${getTableFilterQueryString()}`,
-    ProjectFlockApi.getAllFetcher
+    ProjectFlockApi.getAllFetcher,
+    { revalidateOnMount: true }
  );

  const areaUrl = `${AreaApi.basePath}?${new URLSearchParams({
@@ -191,7 +190,7 @@ const ProjectFlockTable = () => {
    KandangApi.getAllFetcher
  );

-  // Data to Options Mapping
+  // ===== Data to Options Mapping ======
  const optionsArea = isResponseSuccess(areas)
    ? areas?.data.map((area) => ({
        value: area.id,
@@ -211,7 +210,7 @@ const ProjectFlockTable = () => {
      }))
    : [];

-  // Handler
+  // ====== HANDLER ======
  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
    const newVal = val as OptionType;
    setPageSize(newVal.value as number);
@@ -219,17 +218,17 @@ const ProjectFlockTable = () => {
  const confirmationModalDeleteClickHandler = async () => {
    setIsDeleteLoading(true);

-    await ProjectFlockApi.delete(selectedProjectFlock?.id as number);
+    await ProjectFlockApi.delete(selectedSingleRow?.id as number);
    refreshProjectFlocks();

    deleteModal.closeModal();
    toast.success('Successfully delete Project Flock!');
    setIsDeleteLoading(false);
+    setRowSelection({});
  };
  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
    updateFilter('search', e.target.value);
  };
-
  const confirmApprovalHandler = async (
    notes: string,
    approvalAction: 'APPROVED' | 'REJECTED'
@@ -259,22 +258,44 @@ const ProjectFlockTable = () => {
    setIsApproveLoading(false);
  };

+  // ====== EFFECT ======
+  useEffect(() => {
+    refreshProjectFlocks();
+  }, [refresh]);
+
+  // ====== MEMO ======
+  const selectedSingleRow: ProjectFlock | null | undefined = useMemo(() => {
+    return selectedRowIds.length === 1
+      ? isResponseSuccess(projectFlocks)
+        ? projectFlocks?.data.find((row) => row.id === selectedRowIds[0])
+        : null
+      : null;
+  }, [rowSelection]);
+
+  const canApprove = useMemo(() => {
+    if (!selectedSingleRow || isApproveLoading) return false;
+
+    const isPengajuan = selectedSingleRow.approval.step_number == 1;
+    const isNotRejected = selectedSingleRow.approval.action != 'REJECTED';
+
+    return isPengajuan && isNotRejected;
+  }, [selectedSingleRow, isApproveLoading]);
+
  return (
    <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='min-h-screen w-full p-0 sm:p-4'>
        <div className='flex flex-col gap-2 mb-4'>
          <div className='w-full flex flex-col justify-between items-end gap-2'>
            <div className='flex flex-col sm:flex-row gap-3 w-full'>
              <Button
-                href='/production/project-flock/add'
-                variant='outline'
                color='primary'
                className='w-full sm:w-fit'
+                href='/production/project-flock/add'
              >
                <Icon icon='ic:round-plus' width={24} height={24} />
                Tambah
              </Button>
-              <Button
+              {/* <Button
                variant='outline'
                color='success'
                onClick={() => {
@@ -299,7 +320,7 @@ const ProjectFlockTable = () => {
              >
                <Icon icon='mdi:times' width={24} height={24} />
                Reject
-              </Button>
+              </Button> */}
              <div className='ms-auto w-full sm:w-auto'>
                <DebouncedTextInput
                  name='search'
@@ -391,9 +412,7 @@ const ProjectFlockTable = () => {
                id: 'select',
                header: ({ table }) => {
                  const allRows = table.getRowModel().rows;
-                  const selectableRows = allRows.filter(
-                    (row) => row.original?.approval?.step_number == 1
-                  );
+                  const selectableRows = allRows;

                  const allSelected =
                    selectableRows.every((row) => row.getIsSelected()) &&
@@ -417,12 +436,6 @@ const ProjectFlockTable = () => {
                        checked={allSelected}
                        indeterminate={someSelected}
                        onChange={toggleSelectableRows}
-                        disabled={
-                          isResponseSuccess(projectFlocks) &&
-                          projectFlocks?.data?.filter(
-                            (flock) => flock.approval.step_number == 1
-                          ).length == 0
-                        }
                      />
                    </div>
                  );
@@ -431,14 +444,8 @@ const ProjectFlockTable = () => {
                  return (
                    <CheckboxInput
                      name='row'
-                      checked={
-                        row.getIsSelected() &&
-                        row.original.approval.step_number == 1
-                      }
-                      disabled={
-                        !row.getCanSelect() ||
-                        row.original.approval.step_number != 1
-                      }
+                      checked={row.getIsSelected()}
+                      disabled={!row.getCanSelect()}
                      indeterminate={row.getIsSomeSelected()}
                      onChange={row.getToggleSelectedHandler()}
                    />
@@ -469,6 +476,40 @@ const ProjectFlockTable = () => {
              {
                accessorKey: 'approval.step_name',
                header: 'Status',
+                cell: (props) => {
+                  const approval = props.row.original.approval;
+
+                  return (
+                    <Badge
+                      variant='soft'
+                      className={{
+                        badge:
+                          'rounded-lg px-2 w-full flex flex-row justify-start',
+                      }}
+                      color={
+                        approval.step_number == 1
+                          ? 'neutral'
+                          : approval.step_number == 2
+                            ? 'success'
+                            : 'error'
+                      }
+                    >
+                      <Icon
+                        icon='mdi:circle'
+                        width={12}
+                        height={12}
+                        color={
+                          approval.step_number == 1
+                            ? 'neutral'
+                            : approval.step_number == 2
+                              ? 'success'
+                              : 'error'
+                        }
+                      />
+                      {approval.step_name}
+                    </Badge>
+                  );
+                },
              },
              {
                header: 'Kandang',
@@ -496,51 +537,51 @@ const ProjectFlockTable = () => {
                accessorKey: 'created_at',
                header: 'Dibuat pada',
                cell: (props) =>
-                  new Date(props.row.original.created_at).toLocaleDateString(),
+                  formatDate(props.row.original.created_at, 'MMM DD, YYYY'),
              },
-              {
-                header: 'Aksi',
-                cell: (props) => {
-                  const currentPageSize =
-                    props.table.getPaginationRowModel().rows.length;
-                  const currentPageRows =
-                    props.table.getPaginationRowModel().flatRows;
-                  const currentRowRelativeIndex =
-                    currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
+              // {
+              //   header: 'Aksi',
+              //   cell: (props) => {
+              //     const currentPageSize =
+              //       props.table.getPaginationRowModel().rows.length;
+              //     const currentPageRows =
+              //       props.table.getPaginationRowModel().flatRows;
+              //     const currentRowRelativeIndex =
+              //       currentPageRows.findIndex((r) => r.id === props.row.id) + 1;

-                  const isLast2Rows =
-                    currentRowRelativeIndex > currentPageSize - 2;
+              //     const isLast2Rows =
+              //       currentRowRelativeIndex > currentPageSize - 2;

-                  const deleteClickHandler = () => {
-                    setSelectedProjectFlock(props.row.original);
-                    deleteModal.openModal();
-                  };
+              //     const deleteClickHandler = () => {
+              //       setSelectedProjectFlock(props.row.original);
+              //       deleteModal.openModal();
+              //     };

-                  return (
-                    <>
-                      {currentPageSize > 2 && (
-                        <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                          <RowOptionsMenu
-                            type='dropdown'
-                            props={props}
-                            deleteClickHandler={deleteClickHandler}
-                          />
-                        </RowDropdownOptions>
-                      )}
+              //     return (
+              //       <>
+              //         {currentPageSize > 2 && (
+              //           <RowDropdownOptions isLast2Rows={isLast2Rows}>
+              //             <RowOptionsMenu
+              //               type='dropdown'
+              //               props={props}
+              //               deleteClickHandler={deleteClickHandler}
+              //             />
+              //           </RowDropdownOptions>
+              //         )}

-                      {currentPageSize <= 2 && (
-                        <RowCollapseOptions>
-                          <RowOptionsMenu
-                            type='collapse'
-                            props={props}
-                            deleteClickHandler={deleteClickHandler}
-                          />
-                        </RowCollapseOptions>
-                      )}
-                    </>
-                  );
-                },
-              },
+              //         {currentPageSize <= 2 && (
+              //           <RowCollapseOptions>
+              //             <RowOptionsMenu
+              //               type='collapse'
+              //               props={props}
+              //               deleteClickHandler={deleteClickHandler}
+              //             />
+              //           </RowCollapseOptions>
+              //         )}
+              //       </>
+              //     );
+              //   },
+              // },
            ]}
            pageSize={tableFilterState.pageSize}
            page={
@@ -576,6 +617,57 @@ const ProjectFlockTable = () => {
        </div>
      </div>

+      <FloatingActionsButton
+        actions={[
+          {
+            action: 'DETAIL',
+            icon: 'mdi:eye-outline',
+            label: 'Lihat Detail',
+            hidden: selectedRowIds.length !== 1,
+            onClick() {
+              router.push(
+                `/production/project-flock/detail?projectFlockId=${selectedRowIds[0]}`
+              );
+              setRowSelection({});
+            },
+          },
+          {
+            action: 'DELETE',
+            icon: 'material-symbols:delete-outline-rounded',
+            label: `Hapus data`,
+            hidden: selectedRowIds.length !== 1,
+            onClick: () => {
+              deleteModal.openModal();
+            },
+          },
+        ]}
+        approvals={[
+          {
+            icon: 'material-symbols:check',
+            label: 'Approve',
+            action: 'APPROVED',
+            onClick: () => {
+              setApprovalAction('APPROVED');
+              confirmModal.openModal();
+            },
+            disabled: !canApprove,
+          },
+          {
+            icon: 'mdi:times',
+            label: 'Reject',
+            action: 'REJECTED',
+            onClick: () => {
+              setApprovalAction('REJECTED');
+              confirmModal.openModal();
+            },
+          },
+        ]}
+        selectedRowIds={selectedRowIds}
+        onClose={() => {
+          setRowSelection({});
+        }}
+      />
+
      <ConfirmationModal
        ref={deleteModal.ref}
        type='error'
@@ -10,7 +10,7 @@ import SelectInput, {
 import PillBadge from '@/components/PillBadge';
 import Table from '@/components/Table';
 import { isResponseSuccess } from '@/lib/api-helper';
-import { cn } from '@/lib/helper';
+import { cn, formatDate, formatTitleCase } from '@/lib/helper';
 import { ProjectFlockApi } from '@/services/api/production/project-flock';
 import { ProjectFlockKandangApi } from '@/services/api/production';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
@@ -21,6 +21,7 @@ import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import useSWR from 'swr';
 import { FormHeader } from '@/components/helper/form/FormHeader';
+import Link from 'next/link';

 const ProjectFlockChickinDetail = ({
  projectFlockId,
@@ -101,11 +102,26 @@ const ProjectFlockChickinDetail = ({
  }, [projectFlockId, listProjectFlock]);
  return (
    <>
-      <FormHeader
+      {/* Header */}
+      <div className='flex flex-row justify-between items-center px-4 py-4'>
+        <div className='flex flex-row items-center h-full gap-2'>
+          <Link
+            href={`/production/project-flock/detail?projectFlockId=${projectFlock?.id}`}
+            className='hover:text-gray-400'
+          >
+            <Icon icon='mdi:arrow-left' width={24} height={24} />
+          </Link>
+          <div className='divider divider-horizontal p-0 m-0'></div>
+          <div className='text-sm text-neutral'>
+            Chick In {projectFlock?.flock_name}
+          </div>
+        </div>
+      </div>
+      {/* <FormHeader
        title={`Chick In ${projectFlock?.flock_name ?? 'Project Flock'}`}
-        backUrl='/production/project-flock'
-      />
-      <div className='flex flex-col gap-4 w-full my-4'>
+        backUrl={`/production/project-flock/detail?projectFlockId=${projectFlock?.id}`}
+      /> */}
+      {/* <div className='flex flex-col gap-4 w-full my-4'>
        <div className='max-w-full sm:max-w-1/2 md:max-w-3/5 lg:max-w-2/5'>
          <SelectInput
            required
@@ -145,8 +161,129 @@ const ProjectFlockChickinDetail = ({
            }
          />
        </div>
+      </div> */}
+      {/* Informasi Umum */}
+      {projectFlock && (
+        <div className='border-t-1 border-gray-300'>
+          <div className='p-4 flex flex-col gap-4'>
+            <h2 className='text-2xl font-semibold'>Informasi Umum</h2>
+            {/* Badge Row  */}
+            <div className='flex flex-row gap-2'>
+              <Badge
+                variant='soft'
+                color={
+                  projectFlock.approval.step_number == 1
+                    ? 'neutral'
+                    : projectFlock.approval.step_number == 2
+                      ? 'success'
+                      : projectFlock.approval.step_number >= 3
+                        ? 'error'
+                        : undefined
+                }
+                className={{
+                  badge: 'rounded-lg px-2',
+                }}
+              >
+                <Icon
+                  icon='mdi:circle'
+                  width={12}
+                  height={12}
+                  color={
+                    projectFlock.approval.step_number == 1
+                      ? 'neutral'
+                      : projectFlock.approval.step_number == 2
+                        ? 'success'
+                        : projectFlock.approval.step_number >= 3
+                          ? 'error'
+                          : undefined
+                  }
+                />{' '}
+                {projectFlock.approval.step_name}
+              </Badge>
+              <div className='divider divider-horizontal p-0 m-0'></div>
+              <Badge
+                color='neutral'
+                variant='soft'
+                className={{ badge: 'rounded-lg px-2' }}
+              >
+                <Icon icon='mdi:bookmark' width={12} height={12} />
+                {` ${formatTitleCase(projectFlock.category)}`}
+              </Badge>
            </div>
-      <Card
+            {/* Information Grid */}
+            <div className='grid grid-cols-3 gap-4'>
+              <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
+                <Icon width={14} height={14} icon='mdi:account' /> Submitted
+              </div>
+              <div className='col-span-2'>
+                <Badge
+                  variant='soft'
+                  color='neutral'
+                  className={{
+                    badge: 'rounded-lg px-2',
+                  }}
+                >
+                  <Icon icon='mdi:account-circle' width={14} height={14} />{' '}
+                  {projectFlock.created_user.name}
+                </Badge>
+              </div>
+
+              <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
+                <Icon width={14} height={14} icon={'mdi:clock'} /> History
+              </div>
+              <div className='col-span-2'>
+                <Button variant='outline' className='py-1 text-sm'>
+                  See History{' '}
+                  <Icon
+                    icon='mdi:arrow-top-right-thin'
+                    width={11}
+                    height={11}
+                  />
+                </Button>
+              </div>
+
+              {/* BARIS 1 */}
+              <div
+                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
+        relative 
+        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
+              >
+                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Area
+              </div>
+              <div className='col-span-2'>{projectFlock.area.name}</div>
+
+              {/* BARIS 2 */}
+              <div
+                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
+        relative 
+        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
+              >
+                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Lokasi
+              </div>
+              <div className='col-span-2'>{projectFlock.location.name}</div>
+
+              <div
+                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
+        relative 
+        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
+              >
+                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> FCR
+              </div>
+              <div className='col-span-2'>{projectFlock.fcr.name}</div>
+
+              {/* BARIS 3 (Terakhir - TIDAK PERLU garis di bawahnya) */}
+              <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
+                <Icon width={14} height={14} icon='mdi:circle-slice-8' />{' '}
+                Kategori
+              </div>
+              <div className='col-span-2'>
+                {formatTitleCase(projectFlock.category)}
+              </div>
+            </div>
+          </div>
+        </div>
+      )}
+      {/* <Card
        title='Informasi Flock'
        className={{
          wrapper: 'w-full bg-white mb-3',
@@ -231,8 +368,152 @@ const ProjectFlockChickinDetail = ({
            paginationClassName: 'hidden',
          }}
        />
-      </Card>
+      </Card> */}
+      {/* Card Kandangs */}
+      <div className='border-t-1 border-gray-300'>
+        <div className='p-4 flex flex-col gap-4'>
+          <h2 className='text-2xl font-semibold'>Daftar Kandang</h2>
+          {isResponseSuccess(listProjectFlock) ? (
+            <>
+              {/* Badge Row  */}
+              <div className='flex flex-row gap-2'>
+                <Badge
+                  variant='soft'
+                  color={'success'}
+                  className={{
+                    badge: 'rounded-lg px-2',
+                  }}
+                >
+                  <Icon
+                    icon='mdi:circle'
+                    width={12}
+                    height={12}
+                    color={'success'}
+                  />{' '}
+                  Disetujui (
+                  {isResponseSuccess(listProjectFlockKandang) &&
+                    listProjectFlockKandang.data.filter(
+                      (k) => k.approval?.step_number == 1
+                    ).length}
+                  )
+                </Badge>
+                <div className='divider divider-horizontal p-0 m-0'></div>
+                <Badge
+                  variant='soft'
+                  color={'neutral'}
+                  className={{
+                    badge: 'rounded-lg px-2',
+                  }}
+                >
+                  <Icon
+                    icon='mdi:circle'
+                    width={12}
+                    height={12}
+                    color={'neutral'}
+                  />{' '}
+                  Pengajuan (
+                  {isResponseSuccess(listProjectFlockKandang) &&
+                    listProjectFlockKandang.data.filter(
+                      (k) => k.approval?.step_number == 2
+                    ).length}
+                  )
+                </Badge>
+                <div className='divider divider-horizontal p-0 m-0'></div>
+                <Badge
+                  color='error'
+                  variant='soft'
+                  className={{ badge: 'rounded-lg px-2' }}
+                >
+                  <Icon
+                    icon={`mdi:circle`}
+                    width={12}
+                    height={12}
+                    color='error'
+                  />
+                  Belum Chickin (
+                  {isResponseSuccess(listProjectFlockKandang) &&
+                    listProjectFlockKandang.data.filter(
+                      (k) => k.approval == null
+                    ).length}
+                  )
+                </Badge>
+              </div>
+              {/* Card Kandang */}
              <Card
+                variant='bordered'
+                className={{
+                  wrapper: 'w-full',
+                  body: 'p-3',
+                }}
+              >
+                <div className='flex flex-col gap-6'>
+                  {isResponseSuccess(listProjectFlockKandang) &&
+                    listProjectFlockKandang.data.map((kandang) => (
+                      <div
+                        key={kandang.id}
+                        className='flex flex-row justify-between items-center'
+                      >
+                        <div className='flex flex-row gap-2 items-center cursor-pointer text-gray-400'>
+                          <Badge
+                            variant='soft'
+                            color={
+                              kandang.approval
+                                ? kandang.approval.step_number == 1
+                                  ? 'success'
+                                  : 'neutral'
+                                : 'error'
+                            }
+                            className={{
+                              badge: 'rounded-lg px-2',
+                            }}
+                          >
+                            <Icon
+                              icon='mdi:circle'
+                              width={12}
+                              height={12}
+                              color={
+                                kandang.approval
+                                  ? kandang.approval.step_number == 1
+                                    ? 'success'
+                                    : 'neutral'
+                                  : 'gray'
+                              }
+                            />
+                          </Badge>
+                          <span className='font-semibold'>
+                            {kandang.kandang.name}
+                          </span>
+                        </div>
+                        <Button
+                          variant='outline'
+                          className='py-1 text-sm'
+                          onClick={() => {
+                            handleChickinClick(kandang);
+                          }}
+                          disabled={projectFlock?.approval?.step_number === 1}
+                        >
+                          Chick In{' '}
+                          <Icon
+                            icon='mdi:arrow-top-right-thin'
+                            width={11}
+                            height={11}
+                          />
+                        </Button>
+                      </div>
+                    ))}
+                </div>
+              </Card>
+            </>
+          ) : (
+            <div className='w-full p-5 text-center'>
+              <span className='text-lg opacity-50'>
+                Pilih project flock terlebih dahulu...
+              </span>
+            </div>
+          )}
+        </div>
+      </div>
+      {/* <Card
        title='Daftar Kandang'
        className={{
          wrapper: 'w-full bg-white',
@@ -351,7 +632,7 @@ const ProjectFlockChickinDetail = ({
            paginationClassName: 'hidden',
          }}
        />
-      </Card>
+      </Card> */}
    </>
  );
 };
@@ -0,0 +1,304 @@
+'use client';
+
+import Button from '@/components/Button';
+import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
+import Table from '@/components/Table';
+import Badge from '@/components/Badge';
+import { cn, formatDate, formatNumber, formatTitleCase } from '@/lib/helper';
+import { ProjectFlock } from '@/types/api/production/project-flock';
+import {
+  ClosingExpense,
+  ProjectFlockKandang,
+} from '@/types/api/production/project-flock-kandang';
+import { Icon } from '@iconify/react';
+import useSWR from 'swr';
+import { ProjectFlockKandangApi } from '@/services/api/production/project-flock-kandang';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { useModal } from '@/components/Modal';
+import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import { useMemo, useState } from 'react';
+import toast from 'react-hot-toast';
+import { useRouter } from 'next/navigation';
+import { ProductWarehouse } from '@/types/api/inventory/product-warehouse';
+
+const ProjectFlockClosingForm = ({
+  projectFlock,
+  projectFlockKandang,
+}: {
+  projectFlock: ProjectFlock;
+  projectFlockKandang: ProjectFlockKandang;
+}) => {
+  const router = useRouter();
+  const closeModal = useModal();
+  const isCanClose = projectFlock.approval?.step_number <= 2;
+  const [isClosingLoading, setIsClosingLoading] = useState(false);
+
+  const { data: closingData, isLoading } = useSWR(
+    `${ProjectFlockKandangApi.basePath}/${projectFlockKandang.id}/closing`,
+    () => ProjectFlockKandangApi.checkClosing(projectFlockKandang.id)
+  );
+
+  const confirmationModalCloseClickHandler = async () => {
+    setIsClosingLoading(true);
+    const deleteProjectFlockRes = await ProjectFlockKandangApi.closing(
+      projectFlock?.id as number,
+      {
+        closed_date: formatDate(new Date(), 'yyyy-MM-dd'),
+        action: isCanClose ? 'close' : 'unclose',
+      }
+    );
+
+    if (isResponseSuccess(deleteProjectFlockRes)) {
+      toast.success(deleteProjectFlockRes?.message as string);
+      router.push(`/production/project-flock`);
+    }
+    if (isResponseError(deleteProjectFlockRes)) {
+      toast.error(deleteProjectFlockRes?.message as string);
+    }
+    setIsClosingLoading(false);
+    closeModal.closeModal();
+  };
+
+  const errorStock = useMemo(() => {
+    return isResponseSuccess(closingData)
+      ? closingData?.data?.stock_remaining.every((stock) => stock.quantity > 0)
+      : false;
+  }, [closingData]);
+
+  const errorExpense = useMemo(() => {
+    return isResponseSuccess(closingData)
+      ? closingData?.data?.expenses.every((expense) => expense.step < 5)
+      : false;
+  }, [closingData]);
+
+  const isCanCloseValid = !errorStock && !errorExpense;
+
+  return (
+    <>
+      <DrawerHeader
+        leftIcon='mdi:arrow-left'
+        leftIconHref={`/production/project-flock/detail?projectFlockId=${projectFlock.id}`}
+        subtitle={`Close ${projectFlock.flock_name}`}
+      ></DrawerHeader>
+
+      {/* Informasi Kandang */}
+      <div className='divider'></div>
+      <div className='px-4 pb-4 flex flex-col gap-4'>
+        <h2 className='text-2xl font-semibold'>Informasi Kandang</h2>
+
+        {/* Badge Row */}
+        <div className='flex flex-row gap-2'>
+          <Badge
+            variant='soft'
+            color='success'
+            className={{
+              badge: 'rounded-lg px-2',
+            }}
+          >
+            <Icon icon='mdi:circle' width={12} height={12} color='success' />{' '}
+            Aktif
+          </Badge>
+          <div className='divider divider-horizontal p-0 m-0'></div>
+          <Badge
+            color='neutral'
+            variant='soft'
+            className={{ badge: 'rounded-lg px-2' }}
+          >
+            <Icon icon='mdi:home' width={12} height={12} />
+            {` Kapasitas ${formatNumber(projectFlockKandang.kandang?.capacity)} Ekor`}
+          </Badge>
+        </div>
+
+        {/* Information Grid */}
+        <div className='grid grid-cols-3 gap-4'>
+          {/* Area */}
+          <div
+            className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
+        relative 
+        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
+          >
+            <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Area
+          </div>
+          <div className='col-span-2'>{projectFlock.area?.name}</div>
+
+          {/* Lokasi */}
+          <div
+            className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
+        relative 
+        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
+          >
+            <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Lokasi
+          </div>
+          <div className='col-span-2'>{projectFlock.location?.name}</div>
+
+          {/* Kandang */}
+          <div
+            className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
+        relative 
+        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
+          >
+            <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Kandang
+          </div>
+          <div className='col-span-2'>{projectFlockKandang.kandang?.name}</div>
+
+          {/* Jumlah DOC */}
+          <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
+            <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Jumlah DOC
+          </div>
+          <div className='col-span-2'>
+            {formatNumber(
+              projectFlockKandang.chickins?.reduce(
+                (total, chickin) => total + chickin.usage_qty,
+                0
+              ) ?? 0
+            )}{' '}
+            Ekor
+          </div>
+        </div>
+      </div>
+
+      {/* Table Biaya */}
+      <div className='divider'></div>
+      <div className='px-4 pb-4'>
+        <h2 className='text-2xl font-semibold'>Biaya</h2>
+        <Table<ClosingExpense>
+          data={
+            isResponseSuccess(closingData) ? closingData.data?.expenses : []
+          }
+          columns={[
+            {
+              header: 'PO Number',
+              accessorKey: 'po_number',
+            },
+            {
+              header: 'Total',
+              accessorKey: 'total',
+            },
+            {
+              header: 'Status',
+              accessorKey: 'status',
+              cell(props) {
+                return (
+                  <Badge
+                    className={{
+                      badge: 'rounded-lg',
+                    }}
+                    variant='soft'
+                    color={
+                      props.row.original.step < 5
+                        ? props.row.original.step == 1
+                          ? 'neutral'
+                          : 'success'
+                        : 'error'
+                    }
+                  >
+                    {formatTitleCase(props.row.original.status)}
+                  </Badge>
+                );
+              },
+            },
+          ]}
+          className={{
+            containerClassName: cn('my-4'),
+            tableWrapperClassName: 'overflow-x-auto min-h-full! max-w-120',
+            tableClassName: 'font-inter w-full table-sm min-h-full!',
+            headerRowClassName: 'border-b border-b-gray-200',
+            headerColumnClassName:
+              'px-3 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
+            bodyRowClassName: 'border-b border-b-gray-200',
+            bodyColumnClassName:
+              'px-3 py-3 last:flex last:flex-row last:justify-end',
+            paginationClassName: 'hidden',
+          }}
+        />
+        {errorExpense && (
+          <div className='text-center text-error'>
+            *Pastikan semua biaya sudah selesai sebelum melakukan closing.
+          </div>
+        )}
+      </div>
+
+      {/* Table Persediaan Gudang */}
+      <div className='divider'></div>
+      <div className='px-4 pb-4'>
+        <h2 className='text-2xl font-semibold'>Persediaan Gudang</h2>
+        <Table<ProductWarehouse>
+          data={
+            isResponseSuccess(closingData)
+              ? closingData.data?.stock_remaining
+              : []
+          }
+          columns={[
+            {
+              header: 'Product',
+              accessorKey: 'product.name',
+            },
+            {
+              header: 'Kategori',
+              accessorKey: 'product.product_category.name',
+            },
+            {
+              header: 'Quantity',
+              accessorKey: 'quantity',
+            },
+            {
+              header: 'UOM',
+              accessorKey: 'product.uom.name',
+            },
+          ]}
+          className={{
+            containerClassName: cn('my-4'),
+            tableWrapperClassName: 'overflow-x-auto min-h-full! max-w-120',
+            tableClassName: 'font-inter w-full table-sm min-h-full!',
+            headerRowClassName: 'border-b border-b-gray-200',
+            headerColumnClassName:
+              'px-3 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
+            bodyRowClassName: 'border-b border-b-gray-200',
+            bodyColumnClassName:
+              'px-3 py-3 last:flex last:flex-row last:justify-end',
+            paginationClassName: 'hidden',
+          }}
+        />
+        {errorStock && (
+          <div className='text-center text-error'>
+            *Masih ada sisa stock yang belum dihabiskan.
+          </div>
+        )}
+      </div>
+
+      <div className='p-4 mt-6'>
+        <Button
+          className='w-full'
+          color='error'
+          isLoading={isLoading}
+          disabled={!isCanCloseValid}
+          onClick={() => closeModal.openModal()}
+        >
+          <Icon icon='mdi:checkbox-marked-circle-outline' />{' '}
+          {isCanClose ? 'Close' : 'Unclose'}
+        </Button>
+      </div>
+
+      <ConfirmationModal
+        ref={closeModal.ref}
+        type='error'
+        text={
+          isCanClose
+            ? 'Apakah kamu yakin ingin mengakhiri project ini ? *Pastikan persediaan produk di gudang terkait sudah kosong, dan BOP sudah selesai'
+            : 'Apakah kamu yakin ingin membuka kembali project ini ? *Project ini akan kembali ke status aktif'
+        }
+        secondaryButton={{
+          text: 'Tidak',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'error',
+          isLoading: isClosingLoading,
+          onClick: confirmationModalCloseClickHandler,
+        }}
+      />
+    </>
+  );
+};
+
+export default ProjectFlockClosingForm;
@@ -0,0 +1,439 @@
+import Badge from '@/components/Badge';
+import Button from '@/components/Button';
+import Card from '@/components/Card';
+import { RadioGroup, RadioGroupItem } from '@/components/input/RadioInput';
+import Tooltip from '@/components/Tooltip';
+import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
+import {
+  formatCurrency,
+  formatDate,
+  formatNumber,
+  formatTitleCase,
+} from '@/lib/helper';
+import { ProjectFlock } from '@/types/api/production/project-flock';
+import { Icon } from '@iconify/react';
+import Link from 'next/link';
+import { useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { useModal } from '@/components/Modal';
+import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import { ProjectFlockApi } from '@/services/api/production/project-flock';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import toast from 'react-hot-toast';
+import ApprovalSteps, {
+  useApprovalSteps,
+} from '@/components/pages/ApprovalSteps';
+import { PROJECT_FLOCK_APPROVAL_LINE } from '@/config/approval-line';
+
+const ProjectFlockDetail = ({
+  projectFlock,
+}: {
+  projectFlock: ProjectFlock;
+}) => {
+  const router = useRouter();
+  const deleteModal = useModal();
+  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
+  const [openBudgets, setOpenBudget] = useState(false);
+  const [selectedKandangId, setSelectedKamdangId] = useState<string | null>(
+    null
+  );
+
+  const selectedKandang = projectFlock.kandangs.find(
+    (kandang) => kandang.id === Number(selectedKandangId)
+  );
+
+  const {
+    approvals,
+    isLoading: approvalsLoading,
+    refresh: refreshApprovals,
+  } = useApprovalSteps({
+    latestApproval: projectFlock?.approval,
+    approvalLines: PROJECT_FLOCK_APPROVAL_LINE,
+    moduleName: 'PROJECT_FLOCKS',
+    moduleId: projectFlock?.id.toString() ?? '',
+  });
+
+  const confirmationModalDeleteClickHandler = async () => {
+    setIsDeleteLoading(true);
+    const deleteProjectFlockRes = await ProjectFlockApi.delete(
+      projectFlock?.id as number
+    );
+
+    if (isResponseSuccess(deleteProjectFlockRes)) {
+      toast.success(deleteProjectFlockRes?.message as string);
+      router.push('/production/project-flock');
+    }
+    if (isResponseError(deleteProjectFlockRes)) {
+      toast.error(deleteProjectFlockRes?.message as string);
+    }
+    setIsDeleteLoading(false);
+  };
+
+  return (
+    <>
+      <div className='h-full w-full flex flex-col gap-4'>
+        {/* Header */}
+        <DrawerHeader
+          leftIcon='mdi:close'
+          leftIconHref='/production/project-flock'
+          subtitle={`Created On ${formatDate(projectFlock.created_at, 'MMM DD, YYYY')}`}
+        >
+          <Link
+            href={`/production/project-flock/detail/edit?projectFlockId=${projectFlock.id}`}
+            className='p-0'
+          >
+            <Tooltip content='Edit' position='bottom'>
+              <Button variant='link' className='p-0 text-neutral'>
+                <Icon icon='mdi:square-edit-outline' width={20} height={20} />
+              </Button>
+            </Tooltip>
+          </Link>
+          <Button
+            variant='link'
+            className='p-0 text-error'
+            onClick={() => {
+              deleteModal.openModal();
+            }}
+          >
+            <Tooltip content='Hapus' position='bottom'>
+              <Icon icon='mdi:trash-can-outline' width={20} height={20} />
+            </Tooltip>
+          </Button>
+        </DrawerHeader>
+
+        {/* Informasi Umum */}
+        <div className='border-t-1 border-gray-300'>
+          <div className='p-4 flex flex-col gap-4'>
+            <h2 className='text-2xl font-semibold'>Informasi Umum</h2>
+            {/* Status Approval */}
+            {approvals && !approvalsLoading && (
+              <div className='text-sm my-3'>
+                <ApprovalSteps approvals={approvals} />
+              </div>
+            )}
+            {/* Badge Row  */}
+            <div className='flex flex-row gap-2'>
+              <Badge
+                variant='soft'
+                color={
+                  projectFlock.approval?.step_number == 1
+                    ? 'neutral'
+                    : projectFlock.approval?.step_number == 2
+                      ? 'success'
+                      : projectFlock.approval?.step_number >= 3
+                        ? 'error'
+                        : undefined
+                }
+                className={{
+                  badge: 'rounded-lg px-2',
+                }}
+              >
+                <Icon
+                  icon='mdi:circle'
+                  width={12}
+                  height={12}
+                  color={
+                    projectFlock.approval?.step_number == 1
+                      ? 'neutral'
+                      : projectFlock.approval?.step_number == 2
+                        ? 'success'
+                        : projectFlock.approval?.step_number >= 3
+                          ? 'error'
+                          : undefined
+                  }
+                />{' '}
+                {projectFlock.approval?.step_name}
+              </Badge>
+              <div className='divider divider-horizontal p-0 m-0'></div>
+              <Badge
+                color='neutral'
+                variant='soft'
+                className={{ badge: 'rounded-lg px-2' }}
+              >
+                <Icon icon='mdi:bookmark' width={12} height={12} />
+                {` ${formatTitleCase(projectFlock.category)}`}
+              </Badge>
+            </div>
+            {/* Information Grid */}
+            <div className='grid grid-cols-3 gap-4'>
+              <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
+                <Icon width={14} height={14} icon='mdi:account' /> Submitted
+              </div>
+              <div className='col-span-2'>
+                <Badge
+                  variant='soft'
+                  color='neutral'
+                  className={{
+                    badge: 'rounded-lg px-2',
+                  }}
+                >
+                  <Icon icon='mdi:account-circle' width={14} height={14} />{' '}
+                  {projectFlock.created_user.name}
+                </Badge>
+              </div>
+
+              {/* <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
+                <Icon width={14} height={14} icon={'mdi:clock'} /> History
+              </div>
+              <div className='col-span-2'>
+                <Button variant='outline' className='py-1 text-sm'>
+                  See History{' '}
+                  <Icon
+                    icon='mdi:arrow-top-right-thin'
+                    width={11}
+                    height={11}
+                  />
+                </Button>
+              </div> */}
+
+              {/* BARIS 1 */}
+              <div
+                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
+        relative 
+        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
+              >
+                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Area
+              </div>
+              <div className='col-span-2'>{projectFlock.area.name}</div>
+
+              {/* BARIS 2 */}
+              <div
+                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
+        relative 
+        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
+              >
+                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Lokasi
+              </div>
+              <div className='col-span-2'>{projectFlock.location.name}</div>
+
+              <div
+                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
+        relative 
+        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
+              >
+                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> FCR
+              </div>
+              <div className='col-span-2'>{projectFlock.fcr.name}</div>
+
+              {/* BARIS 3 (Terakhir - TIDAK PERLU garis di bawahnya) */}
+              <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
+                <Icon width={14} height={14} icon='mdi:circle-slice-8' />{' '}
+                Kategori
+              </div>
+              <div className='col-span-2'>
+                {formatTitleCase(projectFlock.category)}
+              </div>
+            </div>
+          </div>
+        </div>
+
+        {/* Kandang Aktif */}
+        <div className='border-t-1 border-gray-300'>
+          <div className='p-4 flex flex-col gap-4'>
+            <h2 className='text-2xl font-semibold'>Kandang Aktif</h2>
+            {/* Badge Row  */}
+            <div className='flex flex-row gap-2'>
+              <Badge
+                variant='soft'
+                color={'success'}
+                className={{
+                  badge: 'rounded-lg px-2',
+                }}
+              >
+                <Icon
+                  icon='mdi:circle'
+                  width={12}
+                  height={12}
+                  color={'success'}
+                />{' '}
+                Kandang Aktif ({projectFlock.kandangs.length})
+              </Badge>
+              <div className='divider divider-horizontal p-0 m-0'></div>
+              <Badge
+                color='neutral'
+                variant='soft'
+                className={{ badge: 'rounded-lg px-2 cursor-pointer' }}
+                onClick={() => {
+                  setOpenBudget(!openBudgets);
+                }}
+              >
+                {` ${formatCurrency(
+                  (projectFlock.project_budgets ?? []).reduce(
+                    (acc, curr) => acc + curr.price * curr.qty,
+                    0
+                  )
+                )}`}
+                <Icon
+                  icon={`mdi:${openBudgets ? 'eye' : 'eye-off'}`}
+                  width={12}
+                  height={12}
+                />
+              </Badge>
+            </div>
+
+            {/* Card List Project Budgets */}
+            {openBudgets &&
+              (projectFlock.project_budgets ?? []).map((budget) => (
+                <Card
+                  key={budget.id}
+                  variant='bordered'
+                  className={{
+                    wrapper: 'w-full',
+                    body: 'p-3',
+                  }}
+                >
+                  <div className='flex flex-col gap-6'>
+                    <div className='flex flex-row justify-between items-center'>
+                      <div className='flex flex-row gap-2 items-center text-gray-400'>
+                        <Icon icon={'mdi:tag'} width={14} height={14} />{' '}
+                        <span>Jenis Produk</span>
+                      </div>
+                      <div className='text-end text-gray-500'>
+                        {budget.nonstock?.name}
+                      </div>
+                    </div>
+                    <div className='flex flex-row justify-between items-center'>
+                      <div className='flex flex-row gap-2 items-center text-gray-400'>
+                        <Icon icon={'mdi:tag'} width={14} height={14} />{' '}
+                        <span>Nama Satuan</span>
+                      </div>
+                      <div className='text-end text-gray-500'>
+                        {budget.nonstock?.uom.name}
+                      </div>
+                    </div>
+                    <div className='flex flex-row justify-between items-center'>
+                      <div className='flex flex-row gap-2 items-center text-gray-400'>
+                        <Icon
+                          icon={'mdi:file-multiple'}
+                          width={14}
+                          height={14}
+                        />{' '}
+                        <span>Jumlah Pembelian</span>
+                      </div>
+                      <div className='text-end text-gray-500'>
+                        {formatNumber(budget.qty)}
+                      </div>
+                    </div>
+                    <div className='flex flex-row justify-between items-center'>
+                      <div className='flex flex-row gap-2 items-center text-gray-400'>
+                        <Icon icon={'mdi:file'} width={14} height={14} />{' '}
+                        <span>Harga Satuan</span>
+                      </div>
+                      <div className='text-end text-gray-500'>
+                        {formatCurrency(budget.price)}
+                      </div>
+                    </div>
+                    <div className='flex flex-row justify-between items-center'>
+                      <div className='flex flex-row gap-2 items-center text-gray-400'>
+                        <Icon icon={'mdi:calculator'} width={14} height={14} />{' '}
+                        <span>Total Harga</span>
+                      </div>
+                      <div className='text-end text-gray-500'>
+                        {formatCurrency(budget.price * budget.qty)}
+                      </div>
+                    </div>
+                  </div>
+                </Card>
+              ))}
+
+            {/* Card Kandangs */}
+            <Card
+              variant='bordered'
+              className={{
+                wrapper: 'w-full',
+                body: 'p-3',
+              }}
+            >
+              <RadioGroup
+                name='gender'
+                className={{
+                  radioWrapper: 'grid grid-cols-1 gap-6',
+                }}
+                onChange={(e) => setSelectedKamdangId(e.target.value)}
+                value={selectedKandangId?.toString()}
+                size='md'
+                color='neutral'
+                disabled={projectFlock.approval.step_number == 1}
+              >
+                {projectFlock.kandangs.map((kandang) => (
+                  <div
+                    key={kandang.id}
+                    className={`grid grid-cols-2 gap-6 cursor-pointer hover:text-gray-800`}
+                    onClick={() =>
+                      projectFlock.approval.step_number > 1 &&
+                      setSelectedKamdangId(kandang.id.toString())
+                    }
+                  >
+                    <RadioGroupItem
+                      value={kandang.id.toString()}
+                      label={kandang.name}
+                      disabled={projectFlock.approval.step_number == 1}
+                    />
+                    <div className='text-end'>
+                      <Badge
+                        className={{
+                          badge: 'rounded-lg',
+                        }}
+                      >
+                        Kapasitas {kandang.capacity} Ekor
+                      </Badge>
+                    </div>
+                  </div>
+                ))}
+              </RadioGroup>
+            </Card>
+            <div className='grid grid-cols-4 gap-3'>
+              <Link
+                href={`/production/project-flock/chickin/add/kandang?projectFlockKandangId=${selectedKandang?.project_flock_kandang_id}&projectFlockId=${projectFlock.id}`}
+                className='m-0 p-0'
+              >
+                <Button
+                  className='w-full px-2 py-1 text-sm'
+                  variant='outline'
+                  color='success'
+                  disabled={
+                    !selectedKandangId || projectFlock.approval.step_number == 1
+                  }
+                >
+                  Chickin <Icon icon='mdi:checkbox-marked-outline' />
+                </Button>
+              </Link>
+              <Link
+                href={`/production/project-flock/closing?projectFlockId=${projectFlock.id}&projectFlockKandangId=${selectedKandangId}`}
+                className='m-0 p-0'
+              >
+                <Button
+                  className='w-full px-2 py-1 text-sm'
+                  variant='outline'
+                  color='error'
+                  disabled={
+                    !selectedKandangId || projectFlock.approval.step_number == 1
+                  }
+                >
+                  Close <Icon icon='mdi:checkbox-marked-circle-outline' />
+                </Button>
+              </Link>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <ConfirmationModal
+        ref={deleteModal.ref}
+        type='error'
+        text={`Apakah anda yakin ingin menghapus data Project Flock ini (${projectFlock?.flock_name} - ${projectFlock?.area?.name})?`}
+        secondaryButton={{
+          text: 'Tidak',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'error',
+          isLoading: isDeleteLoading,
+          onClick: confirmationModalDeleteClickHandler,
+        }}
+      />
+    </>
+  );
+};
+
+export default ProjectFlockDetail;
@@ -1,6 +1,71 @@
 import * as Yup from 'yup';

-export const ProjectFlockFormSchema = Yup.object({
+type ProjectFlockFormSchemaType = {
+  flock: {
+    value: number | string;
+    label: string;
+  } | null;
+  flock_name: string;
+  area: {
+    value: number | string;
+    label: string;
+  } | null;
+  area_id: number;
+  category_option: {
+    value: string;
+    label: string;
+  } | null;
+  category: string;
+  fcr: {
+    value: number | string;
+    label: string;
+  } | null;
+  fcr_id: number;
+  location: {
+    value: number | string;
+    label: string;
+  } | null;
+  location_id: number;
+  kandang_ids: number[];
+  project_budgets: ProjectFlockBudgetsSchemaType[];
+};
+
+export type ProjectFlockBudgetsSchemaType = {
+  nonstock: {
+    value: number | string;
+    label: string;
+  } | null;
+  nonstock_id: number | string;
+  qty: number | string;
+  price: number | string;
+  total_price: number | string;
+};
+
+export const ProjectFlockBudgetsSchema: Yup.ObjectSchema<ProjectFlockBudgetsSchemaType> =
+  Yup.object({
+    nonstock: Yup.object({
+      value: Yup.number().required('ID Nonstock wajib diisi!'),
+      label: Yup.string().required('Nama Nonstock wajib diisi!'),
+    }).required('Nonstock wajib diisi!'),
+    nonstock_id: Yup.number()
+      .min(1, 'Nonstock wajib diisi!')
+      .required('Nonstock wajib diisi!'),
+    qty: Yup.number()
+      .typeError('Jumlah harus berupa angka!')
+      .min(1, 'Jumlah minimal 1!')
+      .required('Jumlah wajib diisi!'),
+    price: Yup.number()
+      .typeError('Harga harus berupa angka!')
+      .min(1, 'Harga minimal 1!')
+      .required('Harga wajib diisi!'),
+    total_price: Yup.number()
+      .typeError('Harga harus berupa angka!')
+      .min(1, 'Harga minimal 1!')
+      .required('Harga wajib diisi!'),
+  });
+
+export const ProjectFlockFormSchema: Yup.ObjectSchema<ProjectFlockFormSchemaType> =
+  Yup.object({
    // Flock
    flock: Yup.object({
      value: Yup.number().required('ID Flock wajib diisi!'),
@@ -31,7 +96,9 @@ export const ProjectFlockFormSchema = Yup.object({
      value: Yup.number().required('ID FCR wajib diisi!'),
      label: Yup.string().required('Nama FCR wajib diisi!'),
    }).nullable(),
-  fcr_id: Yup.number().min(1, 'FCR wajib diisi!').required('FCR wajib diisi!'),
+    fcr_id: Yup.number()
+      .min(1, 'FCR wajib diisi!')
+      .required('FCR wajib diisi!'),

    // Location
    location: Yup.object({
@@ -43,10 +110,15 @@ export const ProjectFlockFormSchema = Yup.object({
      .required('Lokasi wajib diisi!'),

    kandang_ids: Yup.array()
-    .of(Yup.number().typeError('Kandang tidak valid!'))
+      .of(Yup.number().required('Kandang tidak valid!'))
      .min(1, 'Minimal harus ada 1 kandang!')
      .required('Kandang wajib diisi!'),
-});
+
+    project_budgets: Yup.array()
+      .of(ProjectFlockBudgetsSchema)
+      .min(1, 'Minimal harus ada 1 data budget!')
+      .required('Data budget wajib diisi!'),
+  });

 export type ProjectFlockFormValues = Yup.InferType<
  typeof ProjectFlockFormSchema
@@ -1,5 +1,7 @@
 'use client';

+import Badge from '@/components/Badge';
+import Card from '@/components/Card';
 import CheckboxInput from '@/components/input/CheckboxInput';
 import PillBadge from '@/components/PillBadge';
 import Table from '@/components/Table';
@@ -9,6 +11,7 @@ import {
  ProjectFlock,
  ProjectFlockPeriods,
 } from '@/types/api/production/project-flock';
+import { Icon } from '@iconify/react';
 import { OnChangeFn, Row } from '@tanstack/react-table';
 import { useMemo } from 'react';

@@ -29,163 +32,119 @@ const ProjectFlockKandangTable = ({
  initialValues?: ProjectFlock;
  formType: 'add' | 'edit' | 'detail';
 }) => {
-  const initialKandangIdSet = useMemo(() => {
-    return initialValues?.kandangs.map((k) => k.id) ?? [];
-  }, [initialValues]);
-  const isRowEnabled = (row: Row<Kandang>) => {
-    const isDisabled =
-      !initialKandangIdSet.includes(row.original.id) &&
-      (row.original.status == 'ACTIVE' ||
-        row.original.status == 'PENGAJUAN' ||
-        formType == 'detail');
-    return !isDisabled;
+  // Fungsi untuk menangani perubahan checkbox
+  const handleCheckboxChange = (kandang: Kandang, isChecked: boolean) => {
+    // Hanya izinkan perubahan jika tidak dalam mode 'detail'
+    if (formType === 'detail') return;
+
+    // Pastikan kandang.id ada dan tidak null/undefined
+    if (kandang.id === undefined) return;
+
+    const kandangIdString = kandang.id.toString();
+
+    setRowSelection((prev) => {
+      const newSelection = { ...prev };
+      if (isChecked) {
+        newSelection[kandangIdString] = true;
+      } else {
+        delete newSelection[kandangIdString];
+      }
+      return newSelection;
+    });
  };
  return (
    <>
-      <Table<Kandang>
-        data={listKandang}
-        columns={[
+      {listKandang.length > 0 ? (
+        <>
+          {/* ... Bagian Badge Status ... */}
+          <div className='flex flex-row mb-4'>
+            <Badge
+              variant='soft'
+              color='primary'
+              className={{
+                badge: 'rounded-lg px-2',
+              }}
+            >
+              <Icon icon='mdi:circle' width={12} height={12} />
+              Tersedia (
              {
-            id: 'select',
-            header: ({ table }) => {
-              const allRows = table.getRowModel().rows;
-              // 1. Filter semua baris dengan logika yang sama persis seperti di cell
-              const selectableRows = allRows.filter(isRowEnabled);
+                listKandang.filter((kandang) => kandang.status == 'NON_ACTIVE')
+                  .length
+              }
+              )
+            </Badge>
+            <div className='divider divider-horizontal mx-1'></div>
+            <Badge
+              variant='soft'
+              color='neutral'
+              className={{
+                badge: 'rounded-lg px-2',
+              }}
+            >
+              <Icon icon='mdi:circle' width={12} height={12} />
+              Tidak Tersedia (
+              {
+                listKandang.filter((kandang) => kandang.status != 'NON_ACTIVE')
+                  .length
+              }
+              )
+            </Badge>
+          </div>
+          {/* --- */}
+          <Card
+            variant='bordered'
+            className={{
+              wrapper: 'w-full rounded-lg',
+              body: 'p-4',
+            }}
+          >
+            <div className='flex flex-col gap-4 w-full'>
+              {listKandang.map((kandang, index) => {
+                const kandangIdString =
+                  kandang.id?.toString() ?? `temp-${index}`;

-              // 2. Cek apakah SEMUA baris yang BISA DIPILIH sudah terpilih
-              const allSelected =
-                selectableRows.length > 0 &&
-                selectableRows.every((row) => row.getIsSelected());
+                const isSelected =
+                  !!rowSelection[kandangIdString] ||
+                  (kandang.id !== undefined &&
+                    selectedIds.includes(kandang.id));

-              // 3. Cek apakah BEBERAPA baris yang BISA DIPILIH sudah terpilih
-              const someSelected =
-                selectableRows.some((row) => row.getIsSelected()) &&
-                !allSelected;
-
-              // 4. Fungsi toggle HANYA akan mentoggle baris yang BISA DIPILIH
-              const toggleSelectableRows = () => {
-                const shouldSelect = !allSelected;
-                selectableRows.forEach((row) =>
-                  row.toggleSelected(shouldSelect)
-                );
-              };
+                const isDisabled =
+                  formType == 'detail' || kandang.status != 'NON_ACTIVE';

                return (
-                <div className='w-full flex flex-row justify-center'>
+                  <div key={index} className='flex flex-row justify-between'>
                    <CheckboxInput
-                    name='allRow'
-                    checked={allSelected}
-                    indeterminate={someSelected}
-                    onChange={toggleSelectableRows}
-                    disabled={
-                      selectableRows.length === 0 || formType == 'detail'
+                      name={`kandang-${kandang.id}`} // Nama unik untuk setiap checkbox
+                      label={kandang.name}
+                      checked={isSelected}
+                      disabled={isDisabled}
+                      onChange={(e) =>
+                        handleCheckboxChange(kandang, e.currentTarget.checked)
                      }
                    />
+                    <Badge
+                      variant='soft'
+                      color={
+                        kandang.status == 'NON_ACTIVE' ? 'primary' : 'neutral'
+                      }
+                      className={{
+                        badge: 'rounded-lg px-2',
+                      }}
+                    >
+                      <Icon icon='mdi:circle' width={12} height={12} />
+                      {kandang.status != 'NON_ACTIVE' && 'Tidak'} Tersedia
+                    </Badge>
                  </div>
                );
-            },
-            cell: ({ row }) => {
-              return (
-                <CheckboxInput
-                  name='row'
-                  checked={
-                    (row.getIsSelected() &&
-                      (row.original.status == 'NON_ACTIVE' ||
-                        row.original.status == 'PENGAJUAN')) ||
-                    (selectedIds && selectedIds.includes(row.original.id))
-                  }
-                  disabled={
-                    formType == 'detail' ||
-                    (!initialKandangIdSet.includes(row.original.id) &&
-                      (row.original.status == 'ACTIVE' ||
-                        row.original.status == 'PENGAJUAN'))
-                  }
-                  indeterminate={row.getIsSomeSelected()}
-                  onChange={row.getToggleSelectedHandler()}
-                />
-              );
-            },
-          },
-          {
-            accessorFn: (row) => row.name,
-            header: 'Kandang',
-          },
-          {
-            accessorFn: (row) => row.status,
-            header: 'Status',
-            cell: (props) => {
-              return (
-                <PillBadge
-                  color={(() => {
-                    switch (props.row.original.status) {
-                      case 'ACTIVE':
-                        return 'red';
-                      case 'PENGAJUAN':
-                        return 'green';
-                      case 'NON_ACTIVE':
-                        return 'blue';
-                      default:
-                        return 'gray';
-                    }
-                  })()}
-                  content={props.row.original.status
-                    .toLowerCase()
-                    .replace(/_/g, ' ')
-                    .replace(/\b\w/g, (char) => char.toUpperCase())}
-                />
-              );
-            },
-          },
-          {
-            accessorFn: (row) => row.capacity,
-            header: 'Kapasitas',
-          },
-          {
-            accessorFn: (row) => row.location?.name,
-            header: 'Periode',
-            cell: (props) => {
-              console.log('listPeriods');
-              console.log(listPeriods);
-              const period =
-                listPeriods.length > 0
-                  ? listPeriods.find((p) => p.id == props.row.original.id)
-                  : undefined;
-              const calcPeriod = period?.period == 0 ? 1 : period?.period;
-              const selected = props.row.getIsSelected();
-              const initPeriod = initialValues?.period;
-              return formType == 'detail'
-                ? selected
-                  ? initPeriod
-                  : '-'
-                : formType == 'add'
-                  ? (calcPeriod ?? '-')
-                  : selected
-                    ? (initPeriod ?? '-')
-                    : (calcPeriod ?? '-');
-            },
-          },
-          {
-            accessorFn: (row) => row.pic?.name,
-            header: 'Penanggung Jawab',
-          },
-        ]}
-        className={{
-          containerClassName: cn({
-            'mb-20': listKandang?.length === 0,
-          }),
-          tableWrapperClassName: 'overflow-x-auto min-h-full!',
-          tableClassName: 'font-inter w-full table-auto min-h-full!',
-          headerRowClassName: 'border-b border-b-gray-200',
-          headerColumnClassName:
-            'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-          bodyRowClassName: 'border-b border-b-gray-200',
-          bodyColumnClassName:
-            'px-6 py-3 last:flex last:flex-row last:justify-end',
-          paginationClassName: 'hidden',
-        }}
-        rowSelection={rowSelection}
-        setRowSelection={setRowSelection}
-      />
+              })}
+            </div>
+          </Card>
+        </>
+      ) : (
+        <div className='text-center py-4 text-gray-400'>
+          Pilih lokasi terlebih dahulu
+        </div>
+      )}
    </>
  );
 };
@@ -35,28 +35,22 @@ const RowOptionsMenu = ({
  deleteClickHandler,
  approveClickHandler,
  rejectClickHandler,
-  isGradingCompleted,
 }: {
  type: 'dropdown' | 'collapse';
  props: CellContext<Recording, unknown>;
  deleteClickHandler: () => void;
  approveClickHandler: () => void;
  rejectClickHandler: () => void;
-  isGradingCompleted: (recording: Recording) => boolean;
 }) => {
-  const isLayingCategory =
-    props.row.original.project_flock_category === 'LAYING';
-
  const isRecordingApproved = (recording: Recording) => {
    return (
      recording.approval?.action === 'APPROVED' &&
-      recording.approval?.step_name === 'Disetujui' &&
-      recording.approval?.step_number === 3
+      recording.approval?.step_number === 2 &&
+      recording.approval?.step_name === 'Disetujui'
    );
  };

  const isApproved = isRecordingApproved(props.row.original);
-  const isGradingDone = isGradingCompleted(props.row.original);

  return (
    <RowOptionsMenuWrapper type={type}>
@@ -78,7 +72,7 @@ const RowOptionsMenu = ({
        <Icon icon='mdi:pencil-outline' width={16} height={16} />
        Edit
      </Button>
-      {!isApproved && !(isLayingCategory && !isGradingDone) && (
+      {!isApproved && (
        <Button
          onClick={approveClickHandler}
          variant='ghost'
@@ -89,7 +83,7 @@ const RowOptionsMenu = ({
          Approve
        </Button>
      )}
-      {!isApproved && !(isLayingCategory && !isGradingDone) && (
+      {!isApproved && (
        <Button
          onClick={rejectClickHandler}
          variant='ghost'
@@ -386,33 +380,10 @@ const RecordingTable = () => {
    RecordingApi.getAllFetcher
  );

-  const isRecordingFullyApproved = useCallback(
-    (recording: Recording): boolean => {
+  const isRecordingApproved = useCallback((recording: Recording): boolean => {
    return (
      recording.approval?.action === 'APPROVED' &&
-        recording.approval?.step_name === 'Disetujui' &&
-        Number(recording.approval?.step_number) === 3
-      );
-    },
-    []
-  );
-
-  const isRecordingApproved = useCallback(
-    (recording: Recording) => {
-      return isRecordingFullyApproved(recording);
-    },
-    [isRecordingFullyApproved]
-  );
-
-  const isGradingCompleted = useCallback((recording: Recording): boolean => {
-    if (recording.project_flock_category !== 'LAYING') {
-      return true;
-    }
-
-    return (
-      recording.egg_grading_status === 'COMPLETED' ||
-      (recording.approval?.action === 'UPDATED' &&
-        recording.approval?.step_number === 2)
+      recording.approval?.step_name === 'Disetujui'
    );
  }, []);

@@ -506,19 +477,9 @@ const RecordingTable = () => {
    if (!isResponseSuccess(recordings) || !recordings.data) return [];
    return selectedRowIds.filter((id) => {
      const recording = recordings.data.find((r) => r.id === id);
-      if (!recording || isRecordingApproved(recording)) return false;
-
-      if (recording.project_flock_category === 'GROWING') {
-        return true;
-      }
-
-      if (recording.project_flock_category === 'LAYING') {
-        return isGradingCompleted(recording);
-      }
-
-      return false;
+      return recording && !isRecordingApproved(recording);
    });
-  }, [selectedRowIds, recordings, isRecordingApproved, isGradingCompleted]);
+  }, [selectedRowIds, recordings, isRecordingApproved]);

  useEffect(() => {
    if (isResponseSuccess(recordings) && recordings.data) {
@@ -530,14 +491,7 @@ const RecordingTable = () => {
            (r) => r.id === parseInt(rowId)
          );
          if (recording && !isRecordingApproved(recording)) {
-            if (recording.project_flock_category === 'GROWING') {
            newSelection[rowId] = true;
-            } else if (
-              recording.project_flock_category === 'LAYING' &&
-              isGradingCompleted(recording)
-            ) {
-              newSelection[rowId] = true;
-            }
          }
        }
      });
@@ -548,13 +502,7 @@ const RecordingTable = () => {
        setRowSelection(newSelection);
      }
    }
-  }, [
-    recordings,
-    rowSelection,
-    isRecordingApproved,
-    isGradingCompleted,
-    setRowSelection,
-  ]);
+  }, [recordings, rowSelection, isRecordingApproved, setRowSelection]);

  return (
    <div className='w-full p-0 sm:p-4'>
@@ -640,40 +588,28 @@ const RecordingTable = () => {
            id: 'select',
            header: ({ table }) => {
              const allRows = table.getRowModel().rows;
-
-              const selectableGrowingRows = allRows.filter((row) => {
+              const selectableRows = allRows.filter((row) => {
                const recording = row.original;
-                return (
-                  recording.project_flock_category === 'GROWING' &&
-                  !isRecordingApproved(recording)
-                );
+                return !isRecordingApproved(recording);
              });

-              const hasNoSelectableGrowing = selectableGrowingRows.length === 0;
+              const hasNoSelectableRows = selectableRows.length === 0;

-              const handleSelectAllGrowing = () => {
-                const isAllSelected = selectableGrowingRows.every((row) =>
+              const handleSelectAll = () => {
+                const isAllSelected = selectableRows.every((row) =>
                  row.getIsSelected()
                );

-                allRows.forEach((row) => {
-                  const recording = row.original;
-                  if (
-                    recording.project_flock_category === 'GROWING' &&
-                    !isRecordingApproved(recording)
-                  ) {
+                selectableRows.forEach((row) => {
                  row.toggleSelected(!isAllSelected);
-                  } else if (recording.project_flock_category === 'LAYING') {
-                    row.toggleSelected(false);
-                  }
                });
              };

-              const isAllGrowingSelected =
-                selectableGrowingRows.length > 0 &&
-                selectableGrowingRows.every((row) => row.getIsSelected());
+              const isAllSelected =
+                selectableRows.length > 0 &&
+                selectableRows.every((row) => row.getIsSelected());

-              const isSomeGrowingSelected = selectableGrowingRows.some((row) =>
+              const isSomeSelected = selectableRows.some((row) =>
                row.getIsSelected()
              );

@@ -681,33 +617,20 @@ const RecordingTable = () => {
                <div className='w-full flex flex-row justify-center'>
                  <CheckboxInput
                    name='allRow'
-                    checked={isAllGrowingSelected}
-                    indeterminate={
-                      isSomeGrowingSelected && !isAllGrowingSelected
-                    }
-                    onChange={handleSelectAllGrowing}
-                    disabled={hasNoSelectableGrowing}
+                    checked={isAllSelected}
+                    indeterminate={isSomeSelected && !isAllSelected}
+                    onChange={handleSelectAll}
+                    disabled={hasNoSelectableRows}
                  />
                </div>
              );
            },
            cell: ({ row }) => {
-              const isApproved = isRecordingApproved(row.original);
-              const isLayingCategory =
-                row.original.project_flock_category === 'LAYING';
-
-              if (isLayingCategory) {
-                return null;
-              }
-
-              const isDisabled = !row.getCanSelect() || isApproved;
-
              return (
                <div>
                  <CheckboxInput
                    name='row'
                    checked={row.getIsSelected()}
-                    disabled={isDisabled}
                    indeterminate={row.getIsSomeSelected()}
                    onChange={row.getToggleSelectedHandler()}
                  />
@@ -883,7 +806,6 @@ const RecordingTable = () => {
                        deleteClickHandler={deleteClickHandler}
                        approveClickHandler={approveClickHandler}
                        rejectClickHandler={rejectClickHandler}
-                        isGradingCompleted={isGradingCompleted}
                      />
                    </RowDropdownOptions>
                  )}
@@ -896,7 +818,6 @@ const RecordingTable = () => {
                        deleteClickHandler={deleteClickHandler}
                        approveClickHandler={approveClickHandler}
                        rejectClickHandler={rejectClickHandler}
-                        isGradingCompleted={isGradingCompleted}
                      />
                    </RowCollapseOptions>
                  )}
@@ -4,7 +4,6 @@ import {
  CreateGrowingRecordingPayload,
  CreateLayingRecordingPayload,
  CreateEggPayload,
-  CreateGradingPayload,
 } from '@/types/api/production/recording';

 type RecordingGrowingFormSchemaType = {
@@ -32,14 +31,7 @@ type RecordingLayingFormSchemaType = RecordingGrowingFormSchemaType & {
  eggs: {
    product_warehouse_id: number;
    qty: number | string;
-  }[];
-};
-
-type RecordingGradingFormSchemaType = {
-  eggs_grading: {
-    recording_egg_id: number;
-    grade: string;
-    qty: number | string;
+    weight: number | string;
  }[];
 };

@@ -62,6 +54,7 @@ export type DepletionSchema = {
 export type EggSchema = {
  product_warehouse_id: number;
  qty: number | string;
+  weight: number | string;
 };

 const BodyWeightObjectSchema: Yup.ObjectSchema<BodyWeightSchema> = Yup.object({
@@ -109,6 +102,10 @@ const EggObjectSchema: Yup.ObjectSchema<EggSchema> = Yup.object({
    .required('Jumlah telur wajib diisi!')
    .min(1, 'Jumlah telur tidak boleh 0!')
    .typeError('Jumlah telur harus berupa angka!'),
+  weight: Yup.number()
+    .required('Berat telur wajib diisi!')
+    .min(1, 'Berat telur minimal 1 gram!')
+    .typeError('Berat telur harus berupa angka!'),
 });

 export const RecordingGrowingFormSchema: Yup.ObjectSchema<RecordingGrowingFormSchemaType> =
@@ -190,30 +187,6 @@ export const UpdateRecordingLayingFormSchema = RecordingLayingFormSchema.shape({
    .required('Project Flock Kandang wajib diisi!'),
 });

-export const RecordingGradingFormSchema: Yup.ObjectSchema<RecordingGradingFormSchemaType> =
-  Yup.object({
-    eggs_grading: Yup.array()
-      .of(
-        Yup.object({
-          recording_egg_id: Yup.number()
-            .required('Recording Egg ID wajib diisi!')
-            .min(1, 'Recording Egg ID minimal 1!')
-            .typeError('Recording Egg ID harus berupa angka!'),
-          grade: Yup.string()
-            .required('Grade telur wajib diisi!')
-            .typeError('Grade telur harus berupa string!'),
-          qty: Yup.number()
-            .required('Jumlah telur wajib diisi!')
-            .min(1, 'Jumlah telur minimal 1!')
-            .typeError('Jumlah telur harus berupa angka!'),
-        })
-      )
-      .min(1, 'Minimal harus ada 1 data grading telur!')
-      .required('Data grading telur wajib diisi!'),
-  });
-
-export const UpdateRecordingGradingFormSchema = RecordingGradingFormSchema;
-
 export type RecordingGrowingFormValues = Yup.InferType<
  typeof RecordingGrowingFormSchema
 >;
@@ -222,10 +195,6 @@ export type RecordingLayingFormValues = Yup.InferType<
  typeof RecordingLayingFormSchema
 >;

-export type RecordingGradingFormValues = Yup.InferType<
-  typeof RecordingGradingFormSchema
->;
-
 type RecordingFormData = Partial<Recording> & {
  body_weights?: CreateGrowingRecordingPayload['body_weights'];
  stocks?: CreateGrowingRecordingPayload['stocks'] | Recording['stocks'];
@@ -295,26 +264,12 @@ export const getRecordingLayingFormInitialValues = (
  eggs: initialValues?.eggs?.map((egg: CreateEggPayload) => ({
    product_warehouse_id: egg.product_warehouse_id,
    qty: egg.qty,
+    weight: egg.weight,
  })) ?? [
    {
      product_warehouse_id: 0,
      qty: '',
-    },
-  ],
-});
-
-export const getRecordingGradingFormInitialValues = (
-  initialValues?: Partial<CreateGradingPayload> & { recording_egg_id?: number }
-): RecordingGradingFormValues => ({
-  eggs_grading: initialValues?.eggs_grading?.map((grading) => ({
-    recording_egg_id: grading.recording_egg_id,
-    grade: grading.grade,
-    qty: grading.qty,
-  })) ?? [
-    {
-      recording_egg_id: initialValues?.recording_egg_id ?? 0,
-      grade: '',
-      qty: '',
+      weight: '',
    },
  ],
 });
@@ -16,7 +16,6 @@ import CheckboxInput from '@/components/input/CheckboxInput';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
 import { useModal } from '@/components/Modal';
-import Tooltip from '@/components/Tooltip';

 import {
  ProjectFlockKandangApi,
@@ -98,9 +97,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
  const [recordingFormErrorMessage, setRecordingFormErrorMessage] =
    useState('');
  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
-  const [newRecordingData, setNewRecordingData] = useState<Recording | null>(
-    null
-  );
+  const [, setNewRecordingData] = useState<Recording | null>(null);
  const [nextDayRecording, setNextDayRecording] =
    useState<NextDayRecording | null>(null);

@@ -111,18 +108,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
  const isRecordingApproved = useCallback((recording?: Recording) => {
    return (
      recording?.approval?.action === 'APPROVED' &&
-      recording?.approval?.step_name === 'Disetujui' &&
-      recording?.approval?.step_number === 3
-    );
-  }, []);
-
-  const hasGradingData = useCallback((recording?: Recording) => {
-    if (!recording || !recording.eggs) return false;
-    return recording.eggs.some(
-      (egg) =>
-        egg.gradings &&
-        egg.gradings.length > 0 &&
-        egg.gradings.some((grading) => grading.qty > 0)
+      recording?.approval?.step_name === 'Disetujui'
    );
  }, []);

@@ -181,6 +167,10 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
        eggs: (values.eggs ?? []).map((egg) => ({
          product_warehouse_id: egg.product_warehouse_id,
          qty: Number(egg.qty) || 0,
+          weight:
+            typeof egg.weight === 'number'
+              ? egg.weight
+              : parseFloat(String(egg.weight)) || 0,
        })),
      };
    },
@@ -203,35 +193,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
    [router]
  );

-  const createRecordingHandlerWithRedirect = useCallback(
-    async (
-      payload: CreateGrowingRecordingPayload | CreateLayingRecordingPayload,
-      redirectToGrading: boolean = false
-    ) => {
-      const res = await RecordingApi.create(payload);
-      if (isResponseError(res)) {
-        setRecordingFormErrorMessage(res.message);
-        return null;
-      }
-
-      toast.success(res?.message as string);
-
-      if (res?.status === 'success' && res.data) {
-        setNewRecordingData(res.data);
-        return res.data;
-      }
-
-      if (redirectToGrading) {
-        toast.error(
-          'Gagal mendapatkan ID recording. Silakan coba dari halaman list.'
-        );
-        router.push('/production/recording');
-      }
-      return null;
-    },
-    [router]
-  );
-
  const updateRecordingHandler = useCallback(
    async (
      recordingId: number,
@@ -650,7 +611,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
        const hasPakanFlag = product.product.flags?.includes('PAKAN');
        const hasOvkFlag = product.product.flags?.includes('OVK');

-        // Only include products that are in the same location as the selected kandang
        if (hasPakanFlag || hasOvkFlag) {
          options.push({
            value: product.id,
@@ -690,7 +650,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
      depletionProductsData.data.forEach((product) => {
        const productName = product.product.name;

-        // Filter for depletion-related products (culling, mati, afkir)
        if (
          productName.toLowerCase().includes('culling') ||
          productName.toLowerCase().includes('mati') ||
@@ -732,7 +691,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
      eggProductsData.data.forEach((product) => {
        const productName = product.product.name;

-        // Filter for egg-related products
        if (
          productName.toLowerCase().includes('telur') ||
          productName.toLowerCase().includes('egg') ||
@@ -1019,54 +977,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
    );
  }, [formik.values.stocks, getStockUsageError, type]);

-  const hasConsumableEggs = useMemo(() => {
-    if (!isLayingCategory) return false;
-    const layingValues = formik.values as RecordingLayingFormValues;
-    if (!layingValues.eggs || layingValues.eggs.length === 0) return false;
-
-    return layingValues.eggs.some((egg) => {
-      if (!egg.product_warehouse_id || Number(egg.qty) <= 0) return false;
-
-      const product = eggProducts.find(
-        (opt) => opt.value === egg.product_warehouse_id
-      );
-
-      if (!product) return false;
-
-      const productName = product.label.toLowerCase();
-      return (
-        productName.includes('konsumsi') &&
-        productName.includes('baik') &&
-        Number(egg.qty) > 0
-      );
-    });
-  }, [isLayingCategory, formik.values, eggProducts]);
-
-  const hasConsumableEggsInRecording = useCallback((recording?: Recording) => {
-    if (!recording || !recording.eggs || recording.eggs.length === 0)
-      return false;
-
-    return recording.eggs.some((egg) => {
-      if (!egg.product_warehouse || !egg.product_warehouse.product)
-        return false;
-      if (Number(egg.qty) <= 0) return false;
-
-      const productName = egg.product_warehouse.product.name.toLowerCase();
-      return (
-        productName.includes('konsumsi') &&
-        productName.includes('baik') &&
-        Number(egg.qty) > 0
-      );
-    });
-  }, []);
-
-  const hasConsumableEggsInCurrentRecording = useMemo(() => {
-    return (
-      hasConsumableEggsInRecording(initialValues) ||
-      hasConsumableEggsInRecording(newRecordingData || undefined)
-    );
-  }, [initialValues, newRecordingData, hasConsumableEggsInRecording]);
-
  const isRepeaterInputError = (
    arrayName: 'body_weights' | 'stocks' | 'depletions' | 'eggs',
    column: string,
@@ -1278,7 +1188,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
    setIsRejectLoading(false);
  };

-  // Body Weights Handlers
  const addBodyWeight = () => {
    const newBodyWeights = [
      ...(formik.values.body_weights || []),
@@ -1397,7 +1306,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
    setSelectedBodyWeights([]);
  };

-  // Stocks Handlers
  const addStock = () => {
    const newStocks = [
      ...(formik.values.stocks || []),
@@ -1430,7 +1338,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
    setSelectedStocks([]);
  };

-  // Depletions Handlers
  const addDepletion = () => {
    const newDepletions = [
      ...(formik.values.depletions || []),
@@ -1465,7 +1372,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
    setSelectedDepletions([]);
  };

-  // Eggs Handlers
  const addEgg = () => {
    const newEggs = [
      ...((formik.values as RecordingLayingFormValues).eggs || []),
@@ -1485,6 +1391,14 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
    [formik]
  );

+  const handleEggWeightChangeWrapper = useCallback(
+    (idx: number) => (e: React.ChangeEvent<HTMLInputElement>) => {
+      const value = parseFloat(e.target.value) || 0;
+      formik.setFieldValue(`eggs.${idx}.weight`, value);
+    },
+    [formik]
+  );
+
  const removeEgg = (idx: number) => {
    const updatedEggs = (
      formik.values as RecordingLayingFormValues
@@ -1569,9 +1483,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
              Kembali
            </Button>

-            {type === 'detail' &&
-              !isRecordingApproved(initialValues) &&
-              (!isLayingCategory || hasGradingData(initialValues)) && (
+            {type === 'detail' && !isRecordingApproved(initialValues) && (
              <div className='flex flex-row gap-2'>
                <Button
                  variant='outline'
@@ -1583,11 +1495,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                  isLoading={isApproveLoading}
                  className='w-full sm:w-fit'
                >
-                    <Icon
-                      icon='material-symbols:check'
-                      width={24}
-                      height={24}
-                    />
+                  <Icon icon='material-symbols:check' width={24} height={24} />
                  Approve
                </Button>

@@ -1601,11 +1509,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                  isLoading={isRejectLoading}
                  className='w-full sm:w-fit'
                >
-                    <Icon
-                      icon='material-symbols:close'
-                      width={24}
-                      height={24}
-                    />
+                  <Icon icon='material-symbols:close' width={24} height={24} />
                  Reject
                </Button>
              </div>
@@ -1916,7 +1820,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                  {formik.values.body_weights?.map((bw, idx) => (
                    <tr key={`body-weight-${idx}`}>
                      {(type as 'add' | 'edit' | 'detail') !== 'detail' && (
-                        <td className='!align-middle'>
+                        <td className='align-middle!'>
                          <CheckboxInput
                            name={`body-weight-${idx}`}
                            checked={selectedBodyWeights.includes(idx)}
@@ -2166,7 +2070,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                  {formik.values.stocks?.map((stock, idx) => (
                    <tr key={`stock-${idx}`}>
                      {(type as 'add' | 'edit' | 'detail') !== 'detail' && (
-                        <td className='!align-middle'>
+                        <td className='align-middle!'>
                          <CheckboxInput
                            name={`stock-${idx}`}
                            checked={selectedStocks.includes(idx)}
@@ -2386,7 +2290,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                  {formik.values.depletions?.map((depletion, idx) => (
                    <tr key={`depletion-${idx}`}>
                      {(type as 'add' | 'edit' | 'detail') !== 'detail' && (
-                        <td className='!align-middle'>
+                        <td className='align-middle!'>
                          <CheckboxInput
                            name={`depletion-${idx}`}
                            checked={selectedDepletions.includes(idx)}
@@ -2587,6 +2491,15 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                          <span className='text-error'>*</span>
                        </span>
                      </th>
+                      <th>
+                        Berat (gram)
+                        <span
+                          className='tooltip tooltip-error tooltip-bottom '
+                          data-tip='required'
+                        >
+                          <span className='text-error'>*</span>
+                        </span>
+                      </th>
                      {(type as 'add' | 'edit' | 'detail') !== 'detail' && (
                        <th>Action</th>
                      )}
@@ -2597,7 +2510,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                      (egg, idx) => (
                        <tr key={`egg-${idx}`}>
                          {(type as 'add' | 'edit' | 'detail') !== 'detail' && (
-                            <td className='!align-middle'>
+                            <td className='align-middle!'>
                              <CheckboxInput
                                name={`egg-${idx}`}
                                checked={selectedEggs.includes(idx)}
@@ -2662,7 +2575,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                            />
                          </td>
                          <td>
-                            <div className='flex flex-col gap-1'>
                            <NumberInput
                              required
                              name={`eggs.${idx}.qty`}
@@ -2674,8 +2586,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                              thousandSeparator=','
                              decimalSeparator='.'
                              isError={
-                                  isRepeaterInputError('eggs', 'qty', idx)
-                                    .isError
+                                isRepeaterInputError('eggs', 'qty', idx).isError
                              }
                              errorMessage={
                                isRepeaterInputError('eggs', 'qty', idx)
@@ -2687,7 +2598,32 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                              }}
                              placeholder='Masukkan jumlah telur'
                            />
-                            </div>
+                          </td>
+                          <td>
+                            <NumberInput
+                              required
+                              name={`eggs.${idx}.weight`}
+                              value={egg.weight ?? ''}
+                              onChange={handleEggWeightChangeWrapper(idx)}
+                              onBlur={formik.handleBlur}
+                              decimalScale={0}
+                              allowNegative={false}
+                              thousandSeparator=','
+                              decimalSeparator='.'
+                              isError={
+                                isRepeaterInputError('eggs', 'weight', idx)
+                                  .isError
+                              }
+                              errorMessage={
+                                isRepeaterInputError('eggs', 'weight', idx)
+                                  .errorMessage
+                              }
+                              readOnly={type === 'detail'}
+                              className={{
+                                wrapper: 'w-full min-w-24',
+                              }}
+                              placeholder='Masukkan berat telur (gram)...'
+                            />
                          </td>
                          {(type as 'add' | 'edit' | 'detail') !== 'detail' && (
                            <td>
@@ -2779,46 +2715,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
            </div>
            {/* Right side actions */}
            <div className='flex flex-col sm:flex-row sm:justify-end gap-2 w-full sm:w-auto'>
-              {type === 'detail' && isLayingCategory && (
-                <Tooltip
-                  content={
-                    hasConsumableEggsInCurrentRecording
-                      ? 'Lanjut ke proses grading untuk telur konsumsi baik'
-                      : 'Hanya bisa melanjutkan ke grading jika ada Telur Konsumsi Baik'
-                  }
-                  position='left'
-                  color={
-                    hasConsumableEggsInCurrentRecording ? 'info' : 'warning'
-                  }
-                >
-                  <Button
-                    type='button'
-                    color='primary'
-                    disabled={!hasConsumableEggsInCurrentRecording}
-                    className='w-full sm:w-auto'
-                    onClick={() => {
-                      const recordingId =
-                        newRecordingData?.id || initialValues?.id;
-                      if (recordingId) {
-                        router.push(
-                          `/production/recording/grading/add?recording_id=${recordingId}`
-                        );
-                      } else {
-                        toast.error(
-                          'Recording ID tidak ditemukan. Silakan refresh halaman.'
-                        );
-                      }
-                    }}
-                  >
-                    <Icon icon='material-symbols:egg' width={24} height={24} />
-                    {hasGradingData(initialValues) ||
-                    hasGradingData(newRecordingData || undefined)
-                      ? 'Edit Grading'
-                      : 'Lanjut ke Grading'}
-                  </Button>
-                </Tooltip>
-              )}
-
              {type === 'edit' && (
                <div className='flex flex-col sm:flex-row gap-2 w-full sm:w-auto'>
                  <Button
@@ -2870,78 +2766,6 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                  >
                    Submit
                  </Button>
-                  {isLayingCategory && (
-                    <Tooltip
-                      content={
-                        hasConsumableEggs
-                          ? 'Lanjut ke proses grading untuk telur konsumsi baik'
-                          : 'Hanya bisa melanjutkan ke grading jika ada Telur Konsumsi Baik'
-                      }
-                      position='left'
-                      color={hasConsumableEggs ? 'info' : 'warning'}
-                    >
-                      <Button
-                        type='button'
-                        color='info'
-                        className='px-4'
-                        isLoading={formik.isSubmitting}
-                        disabled={
-                          hasExceededStock ||
-                          !formik.isValid ||
-                          formik.isSubmitting ||
-                          !hasConsumableEggs
-                        }
-                        onClick={async () => {
-                          if (!formik.isValid) {
-                            await formik.validateForm();
-                            return;
-                          }
-
-                          setRecordingFormErrorMessage('');
-                          formik.setSubmitting(true);
-
-                          try {
-                            if (isLayingCategory) {
-                              const layingValues =
-                                formik.values as RecordingLayingFormValues;
-                              const layingPayload =
-                                createLayingPayload(layingValues);
-
-                              const recordingData =
-                                await createRecordingHandlerWithRedirect(
-                                  layingPayload as CreateLayingRecordingPayload,
-                                  true
-                                );
-
-                              if (recordingData?.id) {
-                                toast.success(
-                                  'Recording berhasil disimpan! Mengalihkan ke form Grading...'
-                                );
-                                setTimeout(() => {
-                                  router.push(
-                                    `/production/recording/grading/add?recording_id=${recordingData.id}`
-                                  );
-                                }, 1000);
-                              }
-                            }
-                          } catch {
-                            toast.error(
-                              'Gagal membuat recording. Silakan coba lagi.'
-                            );
-                          } finally {
-                            formik.setSubmitting(false);
-                          }
-                        }}
-                      >
-                        <Icon
-                          icon='material-symbols:egg'
-                          width={24}
-                          height={24}
-                        />
-                        Next Step: Grading
-                      </Button>
-                    </Tooltip>
-                  )}
                </div>
              )}
            </div>
@@ -2979,8 +2803,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {

          {/* Approve Confirmation Modal */}
          {(type as 'add' | 'edit' | 'detail') === 'detail' &&
-            !isRecordingApproved(initialValues) &&
-            (!isLayingCategory || hasGradingData(initialValues)) && (
+            !isRecordingApproved(initialValues) && (
              <ConfirmationModalWithNotes
                ref={approveModal.ref}
                type='success'
@@ -3002,8 +2825,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {

          {/* Reject Confirmation Modal */}
          {(type as 'add' | 'edit' | 'detail') === 'detail' &&
-            !isRecordingApproved(initialValues) &&
-            (!isLayingCategory || hasGradingData(initialValues)) && (
+            !isRecordingApproved(initialValues) && (
              <ConfirmationModalWithNotes
                ref={rejectModal.ref}
                type='error'
@@ -16,7 +16,7 @@ import RowDropdownOptions from '@/components/table/RowDropdownOptions';
 import RowCollapseOptions from '@/components/table/RowCollapseOptions';
 import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';

-import { cn, formatDate, formatCurrency } from '@/lib/helper';
+import { cn, formatDate } from '@/lib/helper';
 import { isResponseSuccess } from '@/lib/api-helper';

 import { useTableFilter } from '@/services/hooks/useTableFilter';
@@ -136,14 +136,6 @@ const PurchaseTable = () => {
          ? formatDate(props.row.original.po_date, 'DD MMM YYYY')
          : '-',
    },
-    {
-      accessorKey: 'due_date',
-      header: 'Jatuh Tempo',
-      cell: (props) =>
-        props.row.original.due_date
-          ? formatDate(props.row.original.due_date, 'DD MMM YYYY')
-          : '-',
-    },
    {
      header: 'Aging',
      cell: (props) => {
@@ -156,11 +148,6 @@ const PurchaseTable = () => {
        return `${diffDays} hari`;
      },
    },
-    {
-      accessorKey: 'grand_total',
-      header: 'Total (Rp.)',
-      cell: (props) => formatCurrency(props.row.original.grand_total),
-    },
    {
      header: 'Aksi',
      cell: (props) => {
@@ -52,6 +52,8 @@ const PurchaseOrderAcceptApprovalForm = ({
  const [purchaseOrderFormErrorMessage, setPurchaseOrderFormErrorMessage] =
    useState('');

+  const isRejected = initialValues?.latest_approval?.action === 'REJECTED';
+
  // ===== UTILITY FUNCTIONS =====
  const isRepeaterInputError = (
    idx: number,
@@ -64,7 +66,6 @@ const PurchaseOrderAcceptApprovalForm = ({
      | 'expedition_vendor_id'
      | 'received_qty'
      | 'transport_per_item'
-      | 'transport_total'
  ): { isError: boolean; errorMessage: string } => {
    const touchedItem = formik.touched.items?.[idx];
    const errorItem = formik.errors.items?.[idx] as
@@ -163,6 +164,7 @@ const PurchaseOrderAcceptApprovalForm = ({
    validateOnBlur: true,
    onSubmit: async (values) => {
      const payload: CreateAcceptApprovalRequestPayload = {
+        action: 'APPROVED',
        notes: values.notes || '',
        items:
          values.items?.map((formItem) => {
@@ -181,10 +183,6 @@ const PurchaseOrderAcceptApprovalForm = ({
                typeof formItem.transport_per_item === 'string'
                  ? parseFloat(formItem.transport_per_item) || 0
                  : formItem.transport_per_item || 0,
-              transport_total:
-                typeof formItem.transport_total === 'string'
-                  ? parseFloat(formItem.transport_total) || 0
-                  : formItem.transport_total || 0,
            };
          }) || [],
      };
@@ -239,9 +237,8 @@ const PurchaseOrderAcceptApprovalForm = ({
          vehicle_number: item.vehicle_number || '',
          expedition_vendor: null,
          expedition_vendor_id: 0,
-          received_qty: '',
+          received_qty: item.total_qty || '',
          transport_per_item: '',
-          transport_total: '',
        };
      });
      formik.setFieldValue('items', updatedItems);
@@ -301,7 +298,7 @@ const PurchaseOrderAcceptApprovalForm = ({
  // ===== PURCHASE ITEM OPERATIONS =====
  const handlePurchaseItemChange = (
    idx: number,
-    field: 'received_qty' | 'transport_per_item' | 'transport_total',
+    field: 'received_qty' | 'transport_per_item',
    value: string | number
  ) => {
    const numValue = typeof value === 'string' ? parseFloat(value) || 0 : value;
@@ -318,26 +315,6 @@ const PurchaseOrderAcceptApprovalForm = ({
          : parseFloat(
              formik.values.items?.[idx]?.transport_per_item as string
            ) || 0;
-
-      if (receivedQty > 0 && transportPerItem >= 0) {
-        const calculatedTransportTotal = receivedQty * transportPerItem;
-        formik.setFieldValue(
-          `items.${idx}.transport_total`,
-          calculatedTransportTotal
-        );
-      }
-    }
-
-    if (field === 'transport_total') {
-      const receivedQty =
-        parseFloat(formik.values.items?.[idx]?.received_qty as string) || 0;
-      if (receivedQty > 0 && numValue >= 0) {
-        const calculatedTransportPerItem = numValue / receivedQty;
-        formik.setFieldValue(
-          `items.${idx}.transport_per_item`,
-          calculatedTransportPerItem
-        );
-      }
    }
  };

@@ -386,10 +363,6 @@ const PurchaseOrderAcceptApprovalForm = ({
                  Transport/Item
                  <span className='text-error'>*</span>
                </th>
-                <th>
-                  Total Transport
-                  <span className='text-error'>*</span>
-                </th>
              </tr>
            </thead>
            <tbody>
@@ -657,37 +630,6 @@ const PurchaseOrderAcceptApprovalForm = ({
                        }}
                      />
                    </td>
-                    <td>
-                      <NumberInput
-                        required
-                        name={`items.${idx}.transport_total`}
-                        value={formItem?.transport_total || ''}
-                        onChange={(e) =>
-                          handlePurchaseItemChange(
-                            idx,
-                            'transport_total',
-                            e.target.value
-                          )
-                        }
-                        onBlur={formik.handleBlur}
-                        placeholder='Masukkan total transport'
-                        allowNegative={false}
-                        decimalScale={2}
-                        thousandSeparator=','
-                        decimalSeparator='.'
-                        inputPrefix={'Rp'}
-                        isError={
-                          isRepeaterInputError(idx, 'transport_total').isError
-                        }
-                        errorMessage={
-                          isRepeaterInputError(idx, 'transport_total')
-                            .errorMessage
-                        }
-                        className={{
-                          wrapper: 'min-w-40 md:min-w-52 lg:min-w-64',
-                        }}
-                      />
-                    </td>
                  </tr>
                );
              })}
@@ -732,7 +674,8 @@ const PurchaseOrderAcceptApprovalForm = ({
              disabled={
                !formik.isValid ||
                formik.isSubmitting ||
-                hasQuantityExceededErrors
+                hasQuantityExceededErrors ||
+                isRejected
              }
            >
              Submit
@@ -23,10 +23,12 @@ type PurchaseRequestStaffApprovalFormSchemaType = {
 };

 type PurchaseRequestManagerApprovalFormSchemaType = {
+  action: 'APPROVED' | 'REJECTED';
  notes: string | null;
 };

 type PurchaseRequestAcceptApprovalFormSchemaType = {
+  action: 'APPROVED' | 'REJECTED';
  notes: string | null;
  items: {
    purchase_item?: {
@@ -45,7 +47,6 @@ type PurchaseRequestAcceptApprovalFormSchemaType = {
    expedition_vendor_id: number;
    received_qty: number | string;
    transport_per_item: number | string;
-    transport_total: number | string;
  }[];
 };

@@ -83,7 +84,6 @@ export type PurchaseAcceptApprovalItemSchema = {
  expedition_vendor_id: number;
  received_qty: number | string;
  transport_per_item: number | string;
-  transport_total: number | string;
 };

 export type PurchaseDeleteItemsSchema = {
@@ -152,6 +152,10 @@ const PurchaseStaffApprovalItemObjectSchema: Yup.ObjectSchema<PurchaseStaffAppro

 const PurchaseManagerApprovalObjectSchema: Yup.ObjectSchema<PurchaseRequestManagerApprovalFormSchemaType> =
  Yup.object({
+    action: Yup.mixed<'APPROVED' | 'REJECTED'>()
+      .oneOf(['APPROVED', 'REJECTED'], 'Action harus APPROVED atau REJECTED')
+      .required('Action wajib diisi!')
+      .default('APPROVED'),
    notes: Yup.string().nullable().default(null),
  });

@@ -230,20 +234,6 @@ const PurchaseAcceptApprovalItemObjectSchema: Yup.ObjectSchema<PurchaseAcceptApp
        }
      )
      .typeError('Biaya transport per item harus berupa angka!'),
-    transport_total: Yup.mixed<string | number>()
-      .required('Total biaya transport wajib diisi!')
-      .test(
-        'is-valid-transport-total',
-        'Total biaya transport harus berupa angka lebih dari atau sama dengan 0!',
-        function (value) {
-          if (value === '' || value === null || value === undefined)
-            return false;
-          const numValue =
-            typeof value === 'string' ? parseFloat(value) : value;
-          return !isNaN(numValue) && numValue >= 0;
-        }
-      )
-      .typeError('Total biaya transport harus berupa angka!'),
  });

 export const PurchaseRequestStaffApprovalFormSchema: Yup.ObjectSchema<PurchaseRequestStaffApprovalFormSchemaType> =
@@ -368,6 +358,7 @@ export const PurchaseRequestManagerApprovalFormDefaultValues = (
  purchase?: Purchase
 ): PurchaseRequestManagerApprovalFormSchemaType => {
  return {
+    action: 'APPROVED',
    notes: purchase?.notes ?? null,
  };
 };
@@ -378,6 +369,10 @@ export type PurchaseRequestManagerApprovalFormValues = Yup.InferType<

 export const PurchaseRequestAcceptApprovalFormSchema: Yup.ObjectSchema<PurchaseRequestAcceptApprovalFormSchemaType> =
  Yup.object({
+    action: Yup.mixed<'APPROVED' | 'REJECTED'>()
+      .oneOf(['APPROVED', 'REJECTED'], 'Action harus APPROVED atau REJECTED')
+      .required('Action wajib diisi!')
+      .default('APPROVED'),
    notes: Yup.string().nullable().default(null),
    items: Yup.array()
      .of(PurchaseAcceptApprovalItemObjectSchema)
@@ -388,6 +383,7 @@ export const PurchaseRequestAcceptApprovalFormSchema: Yup.ObjectSchema<PurchaseR

 export const PurchaseRequestAcceptApprovalFormInitialValues: PurchaseRequestAcceptApprovalFormSchemaType =
  {
+    action: 'APPROVED',
    notes: '',
    items: [
      {
@@ -399,7 +395,6 @@ export const PurchaseRequestAcceptApprovalFormInitialValues: PurchaseRequestAcce
        expedition_vendor_id: 0,
        received_qty: '',
        transport_per_item: '',
-        transport_total: '',
      },
    ],
  };
@@ -408,6 +403,7 @@ export const PurchaseRequestAcceptApprovalFormDefaultValues = (
  purchase?: Purchase
 ): PurchaseRequestAcceptApprovalFormSchemaType => {
  return {
+    action: 'APPROVED',
    notes: purchase?.notes ?? null,
    items: purchase?.items
      ? purchase.items.map((item) => ({
@@ -419,7 +415,6 @@ export const PurchaseRequestAcceptApprovalFormDefaultValues = (
          expedition_vendor_id: 0,
          received_qty: '',
          transport_per_item: '',
-          transport_total: '',
        }))
      : [
          {
@@ -431,7 +426,6 @@ export const PurchaseRequestAcceptApprovalFormDefaultValues = (
            expedition_vendor_id: 0,
            received_qty: '',
            transport_per_item: '',
-            transport_total: '',
          },
        ],
  };
@@ -61,7 +61,7 @@ const PurchaseOrderStaffApprovalForm = ({
      return 'add';
    }

-    const currentStep = initialValues?.approval?.step_number || 1;
+    const currentStep = initialValues?.latest_approval?.step_number || 1;

    switch (currentStep) {
      case 1:
@@ -77,7 +77,9 @@ const PurchaseOrderStaffApprovalForm = ({
        // Step 4+ (Penerimaan Barang dan selesai), tidak boleh edit kalau sudah disetujui
        return 'edit';
    }
-  }, [rawDataApprovals, propType, initialValues?.approval?.step_number]);
+  }, [rawDataApprovals, propType, initialValues?.latest_approval?.step_number]);
+
+  const isRejected = initialValues?.latest_approval?.action === 'REJECTED';

  const router = useRouter();
  const searchParams = useSearchParams();
@@ -93,16 +95,16 @@ const PurchaseOrderStaffApprovalForm = ({

  // ===== UTILITY FUNCTIONS =====
  const canUpdatePurchaseItems = useMemo(() => {
-    if (!initialValues?.approval) return false;
+    if (!initialValues?.latest_approval) return false;

-    const currentStep = initialValues.approval.step_number;
+    const currentStep = initialValues.latest_approval.step_number;
    return currentStep >= 3;
-  }, [initialValues?.approval]);
+  }, [initialValues?.latest_approval]);

  const canShowDeleteAddButtons = useMemo(() => {
-    if (!initialValues?.approval) return false;
+    if (!initialValues?.latest_approval) return false;

-    const currentStep = initialValues.approval.step_number;
+    const currentStep = initialValues.latest_approval.step_number;

    // Step 2 (Staff Purchase) dengan mode 'add' tidak boleh add/delete items
    // User hanya boleh input harga dan total harga untuk items yang sudah ada
@@ -112,7 +114,7 @@ const PurchaseOrderStaffApprovalForm = ({

    // Step 3 (Manager Purchase) boleh add/delete items
    return currentStep === 3;
-  }, [initialValues?.approval, type]);
+  }, [initialValues?.latest_approval, type]);

  const isRepeaterInputError = (
    idx: number,
@@ -312,7 +314,9 @@ const PurchaseOrderStaffApprovalForm = ({
        const isNewItemForm =
          !formItem.purchase_item_id || formItem.purchase_item_id === 0;

-        let cleanPayload: UpdateStaffApprovalRequestPayload['items'][0];
+        let cleanPayload: NonNullable<
+          UpdateStaffApprovalRequestPayload['items']
+        >[0];

        if (isNewItemForm) {
          cleanPayload = {
@@ -360,7 +364,9 @@ const PurchaseOrderStaffApprovalForm = ({
          const isNewItemForm =
            !formItem.purchase_item_id || formItem.purchase_item_id === 0;

-          let cleanPayload: UpdateStaffApprovalRequestPayload['items'][0];
+          let cleanPayload: NonNullable<
+            UpdateStaffApprovalRequestPayload['items']
+          >[0];

          if (isNewItemForm) {
            cleanPayload = {
@@ -719,7 +725,10 @@ const PurchaseOrderStaffApprovalForm = ({
                                          'min-w-52 md:min-w-72 lg:min-w-80',
                                      }}
                                      bottomLabel={
-                                        'Previous: ' + purchaseItem.product.name
+                                        type === 'edit'
+                                          ? 'Previous: ' +
+                                            purchaseItem.product.name
+                                          : undefined
                                      }
                                    />
                                  </td>
@@ -819,7 +828,11 @@ const PurchaseOrderStaffApprovalForm = ({
                                      thousandSeparator=','
                                      decimalSeparator='.'
                                      inputPrefix={'Rp'}
-                                      bottomLabel={`Previous: Rp${formatNumber(initialValues?.items?.find((item) => item.id === purchaseItem.id)?.price || 0, 'id-ID', 2, 2)}`}
+                                      bottomLabel={
+                                        type === 'edit'
+                                          ? `Previous: Rp${formatNumber(initialValues?.items?.find((item) => item.id === purchaseItem.id)?.price || 0, 'id-ID', 2, 2)}`
+                                          : undefined
+                                      }
                                      isError={
                                        isRepeaterInputError(
                                          formItemIndex,
@@ -857,7 +870,11 @@ const PurchaseOrderStaffApprovalForm = ({
                                      thousandSeparator=','
                                      decimalSeparator='.'
                                      inputPrefix={'Rp'}
-                                      bottomLabel={`Previous: Rp${formatNumber(initialValues?.items?.find((item) => item.id === purchaseItem.id)?.total_price || 0, 'id-ID', 2, 2)}`}
+                                      bottomLabel={
+                                        type === 'edit'
+                                          ? `Previous: Rp${formatNumber(initialValues?.items?.find((item) => item.id === purchaseItem.id)?.total_price || 0, 'id-ID', 2, 2)}`
+                                          : undefined
+                                      }
                                      isError={
                                        isRepeaterInputError(
                                          formItemIndex,
@@ -1131,7 +1148,7 @@ const PurchaseOrderStaffApprovalForm = ({
                color='primary'
                className='px-4'
                isLoading={formik.isSubmitting}
-                disabled={!formik.isValid || formik.isSubmitting}
+                disabled={!formik.isValid || formik.isSubmitting || isRejected}
              >
                Submit
              </Button>
@@ -78,14 +78,14 @@ export const PurchaseRequestFormSchema: Yup.ObjectSchema<PurchaseRequestFormSche
      value: Yup.number().min(1).required(),
      label: Yup.string().required(),
    }).nullable(),
-    credit_term: Yup.number()
-      .required('Jangka waktu kredit wajib diisi!')
-      .min(0, 'Jangka waktu kredit tidak boleh kurang dari 0!')
-      .typeError('Jangka waktu kredit wajib diisi!'),
    supplier_id: Yup.number()
      .required('Supplier wajib dipilih!')
      .min(1, 'Supplier wajib dipilih!')
      .typeError('Supplier wajib dipilih!'),
+    credit_term: Yup.number()
+      .required('Jangka waktu kredit wajib diisi!')
+      .min(0, 'Jangka waktu kredit tidak boleh kurang dari 0!')
+      .typeError('Jangka waktu kredit wajib diisi!'),
    area: Yup.object({
      value: Yup.number().min(1).required(),
      label: Yup.string().required(),
@@ -27,6 +27,7 @@ import PurchaseOrderInvoice from '@/components/pages/purchase/order/PurchaseOrde

 import Card from '@/components/Card';
 import {
+  CreateAcceptApprovalRequestPayload,
  CreateManagerApprovalRequestPayload,
  CreateStaffApprovalRequestPayload,
  Purchase,
@@ -88,6 +89,8 @@ const PurchaseOrderDetail = ({
  const staffApprovalModal = useModal();
  const staffRejectionModal = useModal();
  const acceptApprovalModal = useModal();
+  const acceptRejectionModal = useModal();
+  const managerRejectionModal = useModal();
  const editModal = useModal();
  const penerimaanBarangModal = useModal();
  const deleteModal = useModal();
@@ -156,9 +159,9 @@ const PurchaseOrderDetail = ({
  }, [goodsReceiptItems]);

  const approvalStep = useMemo(() => {
-    if (!initialValues?.approval) return null;
-    return initialValues.approval.step_number;
-  }, [initialValues?.approval]);
+    if (!initialValues?.latest_approval) return null;
+    return initialValues.latest_approval.step_number;
+  }, [initialValues?.latest_approval]);

  const {
    approvals,
@@ -166,7 +169,7 @@ const PurchaseOrderDetail = ({
    rawDataApprovals,
    refresh: refreshApprovals,
  } = useApprovalSteps({
-    latestApproval: initialValues?.approval,
+    latestApproval: initialValues?.latest_approval,
    approvalLines: PURCHASE_ORDER_APPROVAL_LINE,
    moduleName: 'PURCHASES',
    moduleId: initialValues?.id?.toString() ?? '',
@@ -177,19 +180,22 @@ const PurchaseOrderDetail = ({
  });

  const showApprovalButton =
-    approvalStep !== null && approvalStep >= 1 && approvalStep <= 3;
+    approvalStep !== null &&
+    approvalStep >= 1 &&
+    approvalStep <= 3 &&
+    initialValues?.latest_approval?.action !== 'REJECTED';

  const canDeleteItems = useMemo(() => {
-    if (!initialValues?.approval) return false;
+    if (!initialValues?.latest_approval) return false;

-    const currentStep = initialValues.approval.step_number;
+    const currentStep = initialValues.latest_approval.step_number;

    const hasReachedStep5 = rawDataApprovals?.some(
      (approval) => approval.step_number === 5
    );

    return currentStep === 3 && !hasReachedStep5;
-  }, [initialValues?.approval, rawDataApprovals]);
+  }, [initialValues?.latest_approval, rawDataApprovals]);

  const handleApprovalClick = () => {
    if (!approvalStep) return;
@@ -216,24 +222,30 @@ const PurchaseOrderDetail = ({
      case 1:
        staffRejectionModal.openModal();
        break;
+      case 2:
+        managerRejectionModal.openModal();
+        break;
+      case 3:
+        acceptRejectionModal.openModal();
+        break;
      default:
        break;
    }
  };

  const canShowPurchaseOrderInvoice = useMemo(() => {
-    if (!initialValues?.approval) return false;
+    if (!initialValues?.latest_approval) return false;

-    const currentStep = initialValues.approval.step_number;
+    const currentStep = initialValues.latest_approval.step_number;
    return currentStep >= 3;
-  }, [initialValues?.approval]);
+  }, [initialValues?.latest_approval]);

  const canShowPenerimaanBarang = useMemo(() => {
-    if (!initialValues?.approval) return false;
+    if (!initialValues?.latest_approval) return false;

-    const currentStep = initialValues.approval.step_number;
+    const currentStep = initialValues.latest_approval.step_number;
    return currentStep === 5;
-  }, [initialValues?.approval]);
+  }, [initialValues?.latest_approval]);

  const totalBeforeTax = useMemo(() => {
    return purchaseOrderItems.reduce(
@@ -296,6 +308,33 @@ const PurchaseOrderDetail = ({
    [initialValues?.id, searchParams, refetchData]
  );

+  const createAcceptApprovalHandler = useCallback(
+    async (payload: CreateAcceptApprovalRequestPayload) => {
+      const purchaseRequestId = searchParams.get('purchaseId')
+        ? parseInt(searchParams.get('purchaseId')!)
+        : initialValues?.id || 1;
+
+      if (!purchaseRequestId) {
+        toast.error('Purchase Request ID is required');
+        return;
+      }
+
+      const res = await PurchaseApi.acceptApproval.create(
+        purchaseRequestId,
+        payload
+      );
+
+      if (isResponseError(res)) {
+        toast.error(res.message);
+        return;
+      }
+      toast.success(res?.message as string);
+      refreshApprovals();
+      refetchData?.();
+    },
+    [initialValues?.id, searchParams, refreshApprovals, refetchData]
+  );
+
  // ===== MODAL HANDLERS =====
  const handleStaffApprovalModalClose = useCallback(() => {
    refreshApprovals();
@@ -544,11 +583,6 @@ const PurchaseOrderDetail = ({
      accessorKey: 'transport_per_item',
      cell: (props) => formatCurrency(props.getValue() as number),
    },
-    {
-      header: 'Transport Total',
-      accessorKey: 'transport_total',
-      cell: (props) => formatCurrency(props.getValue() as number),
-    },
  ];

  const summaryData = [
@@ -647,7 +681,7 @@ const PurchaseOrderDetail = ({
            <div className='space-y-4'>
              <div className='group'>
                <div className='flex items-start'>
-                  <span className='font-medium text-gray-600 min-w-[140px] flex-shrink-0'>
+                  <span className='font-medium text-gray-600 min-w-[140px] shrink-0'>
                    Area
                  </span>
                  <span className='text-gray-900 ml-3 break-all'>
@@ -657,7 +691,7 @@ const PurchaseOrderDetail = ({
              </div>
              <div className='group'>
                <div className='flex items-start'>
-                  <span className='font-medium text-gray-600 min-w-[140px] flex-shrink-0'>
+                  <span className='font-medium text-gray-600 min-w-[140px] shrink-0'>
                    Lokasi
                  </span>
                  <span className='text-gray-900 ml-3 break-all'>
@@ -671,7 +705,7 @@ const PurchaseOrderDetail = ({
              </div>
              <div className='group'>
                <div className='flex items-start'>
-                  <span className='font-medium text-gray-600 min-w-[140px] flex-shrink-0'>
+                  <span className='font-medium text-gray-600 min-w-[140px] shrink-0'>
                    Gudang
                  </span>
                  <span className='text-gray-900 ml-3 break-all'>
@@ -685,7 +719,7 @@ const PurchaseOrderDetail = ({
            <div className='space-y-4'>
              <div className='group'>
                <div className='flex items-start'>
-                  <span className='font-medium text-gray-600 min-w-[140px] flex-shrink-0'>
+                  <span className='font-medium text-gray-600 min-w-[140px] shrink-0'>
                    Nama Vendor
                  </span>
                  <span className='text-gray-900 font-medium ml-3 break-all'>
@@ -696,7 +730,7 @@ const PurchaseOrderDetail = ({
              </div>
              <div className='group'>
                <div className='flex items-start'>
-                  <span className='font-medium text-gray-600 min-w-[140px] flex-shrink-0'>
+                  <span className='font-medium text-gray-600 min-w-[140px] shrink-0'>
                    Kategori Vendor
                  </span>
                  <span className='text-gray-900 ml-3 break-all'>
@@ -706,18 +740,7 @@ const PurchaseOrderDetail = ({
              </div>
              <div className='group'>
                <div className='flex items-start'>
-                  <span className='font-medium text-gray-600 min-w-[140px] flex-shrink-0'>
-                    Tgl. Jatuh Tempo
-                  </span>
-                  <span className='text-gray-900 ml-3 break-all'>
-                    : {formatDate(purchaseData.due_date, 'D MMM YYYY')} (
-                    {purchaseData.credit_term} hari)
-                  </span>
-                </div>
-              </div>
-              <div className='group'>
-                <div className='flex items-start'>
-                  <span className='font-medium text-gray-600 min-w-[140px] flex-shrink-0'>
+                  <span className='font-medium text-gray-600 min-w-[140px] shrink-0'>
                    Nomor
                  </span>
                  <span className='text-gray-900 ml-3 break-all'>
@@ -727,7 +750,7 @@ const PurchaseOrderDetail = ({
              </div>
              <div className='group'>
                <div className='flex items-start'>
-                  <span className='font-medium text-gray-600 min-w-[140px] flex-shrink-0'>
+                  <span className='font-medium text-gray-600 min-w-[140px] shrink-0'>
                    Nomor PO
                  </span>
                  <div className='ml-3'>
@@ -925,6 +948,7 @@ const PurchaseOrderDetail = ({
          color: 'success',
          onClick: async (notes) => {
            const payload: CreateManagerApprovalRequestPayload = {
+              action: 'APPROVED',
              notes: notes || null,
            };

@@ -1028,7 +1052,6 @@ const PurchaseOrderDetail = ({
            const payload: CreateStaffApprovalRequestPayload = {
              action: 'REJECTED',
              notes: notes || null,
-              items: [],
            };

            await createStaffApprovalHandler(payload);
@@ -1041,6 +1064,60 @@ const PurchaseOrderDetail = ({
        }}
      />

+      {/* Accept Rejection Modal */}
+      <ConfirmationModalWithNotes
+        ref={acceptRejectionModal.ref}
+        type='error'
+        text='Apakah Anda yakin ingin menolak (reject) penerimaan barang ini?'
+        placeholder='(Opsional) Masukkan alasan penolakan...'
+        rows={4}
+        closeOnBackdrop
+        primaryButton={{
+          text: 'Ya, Tolak',
+          color: 'error',
+          onClick: async (notes) => {
+            const payload: CreateAcceptApprovalRequestPayload = {
+              action: 'REJECTED',
+              notes: notes || null,
+            };
+
+            await createAcceptApprovalHandler(payload);
+            await refetchData?.();
+            acceptRejectionModal.closeModal();
+          },
+        }}
+        secondaryButton={{
+          text: 'Batal',
+        }}
+      />
+
+      {/* Manager Rejection Modal */}
+      <ConfirmationModalWithNotes
+        ref={managerRejectionModal.ref}
+        type='error'
+        text='Apakah Anda yakin ingin menolak (reject) approval manajer untuk permintaan pembelian ini?'
+        placeholder='(Opsional) Masukkan alasan penolakan...'
+        rows={4}
+        closeOnBackdrop
+        primaryButton={{
+          text: 'Ya, Tolak',
+          color: 'error',
+          onClick: async (notes) => {
+            const payload: CreateManagerApprovalRequestPayload = {
+              action: 'REJECTED',
+              notes: notes || null,
+            };
+
+            await createManagerApprovalHandler(payload);
+            await refetchData?.();
+            managerRejectionModal.closeModal();
+          },
+        }}
+        secondaryButton={{
+          text: 'Batal',
+        }}
+      />
+
      {/* Delete Confirmation Modal */}
      <ConfirmationModal
        ref={deleteModal.ref}
@@ -51,14 +51,10 @@ export const MARKETING_APPROVAL_LINE: ApprovalLine = [
 export const RECORDING_APPROVAL_LINE: ApprovalLine = [
  {
    step_number: 1,
-    step_name: 'Grading-Telur',
-  },
-  {
-    step_number: 2,
    step_name: 'Pengajuan',
  },
  {
-    step_number: 3,
+    step_number: 2,
    step_name: 'Disetujui',
  },
 ] as const;
@@ -66,14 +62,10 @@ export const RECORDING_APPROVAL_LINE: ApprovalLine = [
 export const GROWING_RECORDING_APPROVAL_LINE: ApprovalLine = [
  {
    step_number: 1,
-    step_name: 'Grading-Telur',
-  },
-  {
-    step_number: 2,
    step_name: 'Pengajuan',
  },
  {
-    step_number: 3,
+    step_number: 2,
    step_name: 'Disetujui',
  },
 ] as const;
@@ -81,14 +73,10 @@ export const GROWING_RECORDING_APPROVAL_LINE: ApprovalLine = [
 export const LAYING_RECORDING_APPROVAL_LINE: ApprovalLine = [
  {
    step_number: 1,
-    step_name: 'Grading-Telur',
-  },
-  {
-    step_number: 2,
    step_name: 'Pengajuan',
  },
  {
-    step_number: 3,
+    step_number: 2,
    step_name: 'Disetujui',
  },
 ] as const;
@@ -1,155 +1,125 @@
-type MAIN_DRAWER_MENU = {
-  title: string;
-  link: string;
-  icon: string;
-  submenu?: MAIN_DRAWER_MENU[];
-};
+import { SidebarMenuItem } from '@/components/molecules/SidebarMenu';

-export const MAIN_DRAWER_LINKS: MAIN_DRAWER_MENU[] = [
+export const MAIN_DRAWER_LINKS: SidebarMenuItem[] = [
  {
-    title: 'Dashboard',
+    text: 'Dashboard',
    link: '/dashboard',
-    icon: 'gg:chart',
+    icon: 'heroicons-outline:chart-bar-square',
  },
-
  {
-    title: 'Produksi',
+    text: 'Produksi',
    link: '/production',
-    icon: 'material-symbols:conveyor-belt-outline-rounded',
+    icon: 'heroicons-outline:wrench-screwdriver',
    submenu: [
      {
-        title: 'List Flock',
+        text: 'Daftar Flock',
        link: '/production/project-flock',
-        icon: 'material-symbols:list-alt-add-outline-rounded',
      },
-      // { // DI HILANGKAN PADA VERSI REFACTORING
-      //   title: 'Chick In',
-      //   link: '/production/chickin',
-      //   icon: 'mdi:home-import-outline',
-      // },
      {
-        title: 'Recording',
+        text: 'Recording',
        link: '/production/recording',
-        icon: 'mdi:clipboard-text',
      },
      {
-        title: 'Transfer ke Laying',
+        text: 'Transfer to Laying',
        link: '/production/transfer-to-laying',
-        icon: 'streamline:transfer-van',
      },
    ],
  },
-
  {
-    title: 'Pembelian',
+    text: 'Pembelian',
    link: '/purchase',
-    icon: 'gg:shopping-cart',
+    icon: 'heroicons-outline:shopping-cart',
  },
-
  {
-    title: 'Penjualan',
+    text: 'Penjualan',
    link: '/marketing',
-    icon: 'mdi:attach-money',
+    icon: 'heroicons-outline:currency-dollar',
  },
-
  {
-    title: 'Biaya Operasional',
+    text: 'Biaya Operasional',
    link: '/expense',
-    icon: 'uil:wallet',
+    icon: 'heroicons:wallet',
  },
-
  {
-    title: 'Persediaan',
+    text: 'Closing',
+    link: '/closing',
+    icon: 'heroicons-outline:presentation-chart-bar',
+  },
+  {
+    text: 'Persediaan',
    link: '/inventory',
-    icon: 'mdi:warehouse',
+    icon: 'heroicons-outline:folder',
    submenu: [
-      // {
-      //   title: 'Product',
-      //   link: '/inventory/product',
-      //   icon: 'mdi:package-variant-closed',
-      // },
      {
-        title: 'Penyesuaian Stok',
-        link: '/inventory/adjustment',
-        icon: 'mdi:database-edit',
+        text: 'Produk',
+        link: '/inventory/product',
      },
      {
-        title: 'Transfer Stok',
+        text: 'Penyesuaian Stok',
+        link: '/inventory/adjustment',
+      },
+      {
+        text: 'Transfer Stok',
        link: '/inventory/movement',
-        icon: 'mdi:swap-horizontal',
      },
    ],
  },
-
  {
-    title: 'Master Data',
+    text: 'Master Data',
    link: '/master-data',
-    icon: 'majesticons:data-line',
+    icon: 'heroicons-outline:circle-stack',
    submenu: [
      {
-        title: 'Product',
+        text: 'Produk',
        link: '/master-data/product',
-        icon: 'fluent-mdl2:product-variant',
      },
      {
-        title: 'Product Category',
+        text: 'Kategori Produk',
        link: '/master-data/product-category',
-        icon: 'carbon:categories',
      },
      {
-        title: 'Bank',
+        text: 'Bank',
        link: '/master-data/bank',
-        icon: 'mdi:bank-outline',
      },
      {
-        title: 'Area',
+        text: 'Area',
        link: '/master-data/area',
-        icon: 'majesticons:map-marker-area-line',
      },
      {
-        title: 'Location',
+        text: 'Lokasi',
        link: '/master-data/location',
-        icon: 'mingcute:location-line',
      },
      {
-        title: 'Kandang',
+        text: 'Kandang',
        link: '/master-data/kandang',
-        icon: 'mdi:farm-home-outline',
      },
      {
-        title: 'Warehouse',
+        text: 'Warehouse',
        link: '/master-data/warehouse',
-        icon: 'hugeicons:warehouse',
      },
      {
-        title: 'Customer',
+        text: 'Customer',
        link: '/master-data/customer',
-        icon: 'ix:customer',
      },
      {
-        title: 'UOM',
+        text: 'UOM',
        link: '/master-data/uom',
-        icon: 'lsicon:measure-outline',
      },
      {
-        title: 'Non-Stock',
+        text: 'Non-Stock',
        link: '/master-data/nonstock',
-        icon: 'fluent:box-32-regular',
      },
      {
-        title: 'FCR',
+        text: 'FCR',
        link: '/master-data/fcr',
-        icon: 'fluent:food-chicken-leg-16-regular',
      },
      {
-        title: 'Supplier',
+        text: 'Supplier',
        link: '/master-data/supplier',
-        icon: 'material-symbols:add-business-outline-rounded',
      },
      {
-        title: 'Flock',
+        text: 'Flock',
        link: '/master-data/flock',
-        icon: 'material-symbols:raven-outline-rounded',
      },
    ],
  },
@@ -263,14 +233,10 @@ export const APPROVAL_WORKFLOWS = [
    steps: [
      {
        step_number: 1,
-        step_name: 'Grading-Telur',
-      },
-      {
-        step_number: 2,
        step_name: 'Pengajuan',
      },
      {
-        step_number: 3,
+        step_number: 2,
        step_name: 'Disetujui',
      },
    ],
@@ -0,0 +1,25 @@
+/**
+ * Redirects the user to the SSO login page with loop protection.
+ *
+ * This function checks a session storage timestamp to ensure that redirects
+ * do not happen too frequently (blocking infinite redirect loops).
+ */
+export const redirectToSSO = () => {
+  if (typeof window === 'undefined') return;
+
+  const lastRedirect = sessionStorage.getItem('auth_redirect_timestamp');
+  const now = Date.now();
+
+  // Loop protection: allow redirect only if last one was > 5 seconds ago
+  // or if no redirect has happened yet.
+  if (!lastRedirect || now - parseInt(lastRedirect, 10) > 5000) {
+    sessionStorage.setItem('auth_redirect_timestamp', now.toString());
+    // const ssoLoginUrl = `${process.env.NEXT_PUBLIC_SSO_LOGIN_URL as string}?redirect_url=${window.location.href}`;
+
+    const ltiSsoStart = `${process.env.NEXT_PUBLIC_API_BASE_URL as string}/sso/start?client_id=${process.env.NEXT_PUBLIC_CLIENT_ID as string}&redirect_url=${window.location.href}`;
+    const ssoLoginUrl = `${process.env.NEXT_PUBLIC_SSO_LOGIN_URL as string}?redirect_url=${ltiSsoStart}`;
+    window.location.href = ssoLoginUrl;
+  } else {
+    console.error('Redirect loop detected. Aborting redirect.');
+  }
+};
@@ -10,6 +10,8 @@ export const sleep = (ms: number = 1000) =>
  new Promise((resolve) => setTimeout(resolve, ms));

 export const formatDate = (date: moment.MomentInput, format?: string) => {
+  if (!date) return '-';
+
  return moment(date).format(format);
 };

@@ -29,6 +31,14 @@ export const formatNumber = (
  }).format(value);
 };

+export const formatTitleCase = (value: string) => {
+  return value
+    .toLowerCase()
+    .split(' ')
+    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(' ');
+};
+
 export function formatVechicleNumber(value: string): string {
  let result = '';
  for (let i = 0; i < (value?.length ?? 0); i++) {
@@ -119,3 +129,16 @@ export const convertRowSelectionObjToArr = (

  return result;
 };
+
+export const isPathActive = (pathname: string, link?: string) => {
+  if (!link) return false;
+
+  const splittedPathname = pathname.split('/');
+  const splittedLink = link.split('/');
+
+  const isActiveLinkValid = splittedLink.every((linkChunk, idx) => {
+    return linkChunk === splittedPathname[idx];
+  });
+
+  return pathname.startsWith(link) && isActiveLinkValid;
+};
@@ -1,15 +1,17 @@
-import { BaseApiService } from './base';
-import { BaseApiResponse } from '@/types/api/api-general';
-import {
-  ClosingSales,
-  ClosingCosExpedition,
-} from '@/types/api/closing/closing';
+import axios from 'axios';

-export class ClosingApiService extends BaseApiService<
-  ClosingSales,
-  unknown,
-  unknown
-> {
+import { BaseApiService } from '@/services/api/base';
+import {
+  Closing,
+  ClosingGeneralInformation,
+  ClosingIncomingSapronak,
+  ClosingOutgoingSapronak,
+} from '@/types/api/closing';
+import { httpClient, httpClientFetcher } from '@/services/http/client';
+import { BaseApiResponse } from '@/types/api/api-general';
+import { ClosingSales } from '@/types/api/closing';
+
+export class ClosingApiService extends BaseApiService<Closing, null, null> {
  constructor(basePath: string) {
    super(basePath);
  }
@@ -18,24 +20,50 @@ export class ClosingApiService extends BaseApiService<
    id: number
  ): Promise<BaseApiResponse<ClosingSales> | undefined> {
    try {
-      const getPenjualanPath = `${id}/penjualan`;
-      return await this.customRequest<BaseApiResponse<ClosingSales>>(
-        getPenjualanPath
-      );
-    } catch {
+      const getPenjualanPath = `${this.basePath}/${id}/penjualan`;
+      const getPenjualanRes =
+        await httpClient<BaseApiResponse<ClosingSales>>(getPenjualanPath);
+
+      return getPenjualanRes;
+    } catch (error) {
+      if (axios.isAxiosError<BaseApiResponse<ClosingSales>>(error)) {
+        return error.response?.data;
+      }
      return undefined;
    }
  }

-  async getHppEkspedisi(
-    id: number
-  ): Promise<BaseApiResponse<ClosingCosExpedition> | undefined> {
-    try {
-      const getHppEkspedisiPath = `http://localhost:4010/api/closings/${id}/hpp-ekspedisi`;
-      return await this.customRequest<BaseApiResponse<ClosingCosExpedition>>(
-        getHppEkspedisiPath
+  async getAllIncomingSapronakFetcher(
+    endpoint: string
+  ): Promise<BaseApiResponse<ClosingIncomingSapronak[]>> {
+    return await httpClientFetcher<BaseApiResponse<ClosingIncomingSapronak[]>>(
+      endpoint
    );
-    } catch {
+  }
+
+  async getAllOutgoingSapronakFetcher(
+    endpoint: string
+  ): Promise<BaseApiResponse<ClosingOutgoingSapronak[]>> {
+    return await httpClientFetcher<BaseApiResponse<ClosingOutgoingSapronak[]>>(
+      endpoint
+    );
+  }
+
+  async getGeneralInfo(id: number) {
+    try {
+      const getGeneralInfoPath = `${this.basePath}/${id}`;
+      const getGeneralInfoRes =
+        await httpClient<BaseApiResponse<ClosingGeneralInformation>>(
+          getGeneralInfoPath
+        );
+
+      return getGeneralInfoRes;
+    } catch (error) {
+      if (
+        axios.isAxiosError<BaseApiResponse<ClosingGeneralInformation>>(error)
+      ) {
+        return error.response?.data;
+      }
      return undefined;
    }
  }
@@ -492,8 +492,8 @@ export class ExpenseApiService extends BaseApiService<
    });

    formData.append(
-      'cost_per_kandangs',
-      JSON.stringify(payload.cost_per_kandangs)
+      'expense_nonstocks',
+      JSON.stringify(payload.expense_nonstocks)
    );

    return formData;
@@ -514,8 +514,8 @@ export class ExpenseApiService extends BaseApiService<
    });

    formData.append(
-      'cost_per_kandang',
-      JSON.stringify(payload.cost_per_kandang)
+      'expense_nonstocks',
+      JSON.stringify(payload.expense_nonstocks)
    );

    return formData;
@@ -12,6 +12,7 @@ import {
  CreateInventoryAdjustmentPayload,
  InventoryAdjustment,
 } from '@/types/api/inventory/adjustment';
+import { InventoryProduct } from '@/types/api/inventory/product';

 export const ProductWarehouseApi = new BaseApiService<
  ProductWarehouse,
@@ -25,8 +26,14 @@ export const MovementApi = new BaseApiService<
  unknown
 >('/inventory/transfers');

-export const inventoryAdjustmentApi = new BaseApiService<
+export const InventoryAdjustmentApi = new BaseApiService<
  InventoryAdjustment,
  CreateInventoryAdjustmentPayload,
  unknown
 >('/inventory/adjustments');
+
+export const InventoryProductApi = new BaseApiService<
+  InventoryProduct,
+  unknown,
+  unknown
+>('/inventory/product-stocks');
@@ -1,4 +1,4 @@
-import { BaseApiService } from './base';
+import { BaseApiService } from '@/services/api/base';
 import { BaseApiResponse } from '@/types/api/api-general';
 import {
  CreateProjectFlockPayload,
@@ -9,8 +9,6 @@ import {
  CreateRecordingPayload,
  Recording,
  UpdateRecordingPayload,
-  CreateGradingPayload,
-  UpdateGradingPayload,
  NextDayRecording,
 } from '@/types/api/production/recording';
 import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
@@ -64,28 +62,6 @@ export class RecordingService extends BaseApiService<
    });
  }

-  async createGrading(
-    payload: CreateGradingPayload
-  ): Promise<BaseApiResponse<unknown> | undefined> {
-    return await this.customRequest<BaseApiResponse<unknown>>('gradings', {
-      method: 'POST',
-      payload,
-    });
-  }
-
-  async updateGrading(
-    gradingId: number,
-    payload: UpdateGradingPayload
-  ): Promise<BaseApiResponse<unknown> | undefined> {
-    return await this.customRequest<BaseApiResponse<unknown>>(
-      `gradings/${gradingId}`,
-      {
-        method: 'PUT',
-        payload,
-      }
-    );
-  }
-
  async deleteGrading(
    gradingId: number
  ): Promise<BaseApiResponse<unknown> | undefined> {
@@ -2,10 +2,189 @@ import { BaseApiService } from '@/services/api/base';
 import {
  BaseProjectFlockKandang,
  ProjectFlockKandang,
+  ClosingProjectFlockKandangPayload,
+  CheckClosingResponse,
 } from '@/types/api/production/project-flock-kandang';
+import { BaseApiResponse } from '@/types/api/api-general';
+import { httpClient } from '@/services/http/client';
+import axios from 'axios';

-export const ProjectFlockKandangApi = new BaseApiService<
+export class ProjectFlockKandangService extends BaseApiService<
  BaseProjectFlockKandang,
  ProjectFlockKandang,
  unknown
->('project-flock-kandang');
+> {
+  constructor(basePath: string = '') {
+    super(basePath);
+  }
+
+  /**
+   * Close or Unclose Project Flock Kandang
+   */
+  async closing(
+    id: number,
+    payload: ClosingProjectFlockKandangPayload
+  ): Promise<BaseApiResponse<{ message: string }> | undefined> {
+    try {
+      const path = `${this.basePath}/${id}/closing`;
+
+      const headers = {
+        'Content-Type': 'application/json',
+        ...(this.header ?? {}),
+      };
+
+      return await httpClient<BaseApiResponse<{ message: string }>>(path, {
+        method: 'POST',
+        body: payload,
+        headers,
+      });
+    } catch (error: unknown) {
+      if (axios.isAxiosError<BaseApiResponse<{ message: string }>>(error)) {
+        return error.response?.data;
+      }
+      return undefined;
+    }
+  }
+
+  /**
+   * Check Closing Requirements for Project Flock Kandang
+   * TODO: Replace with actual API call when backend is ready
+   */
+  async checkClosing(
+    id: number
+  ): Promise<BaseApiResponse<CheckClosingResponse> | undefined> {
+    // Dummy data - replace with actual API call when backend is ready
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve({
+          code: 200,
+          status: 'success',
+          message: 'Cek persyaratan closing kandang',
+          data: {
+            unfinished_expenses: 2,
+            stock_remaining: [
+              {
+                id: 1,
+                product_id: 1,
+                warehouse_id: 1,
+                quantity: 0,
+                product: {
+                  id: 1,
+                  name: 'Pakan Starter',
+                  brand: 'Brand A',
+                  sku: 'PKN-STR-001',
+                  product_price: 15000,
+                  selling_price: 17000,
+                  tax: 0,
+                  expiry_period: 365,
+                  flags: ['active'],
+                  uom: {
+                    id: 1,
+                    name: 'Kg',
+                    created_user: {
+                      id: 1,
+                      id_user: 1,
+                      email: 'admin@example.com',
+                      name: 'Admin User',
+                    },
+                    created_at: '2024-01-01',
+                    updated_at: '2024-01-01',
+                  },
+                  product_category: {
+                    id: 1,
+                    name: 'Pakan',
+                    code: 'PKN',
+                    created_user: {
+                      id: 1,
+                      id_user: 1,
+                      email: 'admin@example.com',
+                      name: 'Admin User',
+                    },
+                    created_at: '2024-01-01',
+                    updated_at: '2024-01-01',
+                  },
+                  suppliers: [],
+                  created_user: {
+                    id: 1,
+                    id_user: 1,
+                    email: 'admin@example.com',
+                    name: 'Admin User',
+                  },
+                  created_at: '2024-01-01',
+                  updated_at: '2024-01-01',
+                },
+                warehouse: {
+                  id: 1,
+                  name: 'Gudang Utama',
+                  type: 'AREA',
+                  area: {
+                    id: 1,
+                    name: 'Area 1',
+                  },
+                  created_user: {
+                    id: 1,
+                    id_user: 1,
+                    email: 'admin@example.com',
+                    name: 'Admin User',
+                  },
+                  created_at: '2024-01-01',
+                  updated_at: '2024-01-01',
+                },
+                created_user: {
+                  id: 1,
+                  id_user: 1,
+                  email: 'admin@example.com',
+                  name: 'Admin User',
+                },
+                created_at: '2025-01-01',
+                updated_at: '2025-01-01',
+              },
+            ],
+            expenses: [
+              {
+                id: 1,
+                po_number: 'PO-BOP-LTI-00001',
+                category: 'NON-BOP',
+                total: 110000,
+                status: 'SELESAI',
+                step_name: 'Approval Finance',
+                step: 5,
+                reference_number: 'BOP-LTI-00001',
+              },
+              {
+                id: 3,
+                po_number: 'PO-BOP-LTI-00003',
+                category: 'BOP',
+                total: 110000,
+                status: 'SELESAI',
+                step_name: 'Approval Finance',
+                step: 5,
+                reference_number: 'BOP-LTI-00003',
+              },
+            ],
+          },
+        });
+      }, 500); // Simulate network delay
+    });
+
+    /* 
+    // Original API call - uncomment when backend is ready
+    try {
+      const path = `${this.basePath}/${id}/closing/check`;
+
+      return await httpClient<BaseApiResponse<CheckClosingResponse>>(path, {
+        method: 'GET',
+      });
+    } catch (error: unknown) {
+      if (axios.isAxiosError<BaseApiResponse<CheckClosingResponse>>(error)) {
+        return error.response?.data;
+      }
+      return undefined;
+    }
+    */
+  }
+}
+
+export const ProjectFlockKandangApi = new ProjectFlockKandangService(
+  '/production/project-flock-kandangs'
+);
@@ -141,6 +141,38 @@ export class ProjectFlockService extends BaseApiService<
    }
  }

+  /**
+   * Resubmit Project Flock
+   */
+  async resubmit(
+    id: number,
+    payload: UpdateProjectFlockPayload
+  ): Promise<BaseApiResponse<ProjectFlock> | undefined> {
+    try {
+      const updatePath = `${this.basePath}/${id}/resubmit`;
+
+      const headers = {
+        'Content-Type': 'application/json',
+        ...(this.header ?? {}),
+      };
+
+      const updateRes = await httpClient<BaseApiResponse<ProjectFlock>>(
+        updatePath,
+        {
+          method: 'PUT',
+          body: payload,
+          headers,
+        }
+      );
+      return updateRes;
+    } catch (error: unknown) {
+      if (axios.isAxiosError<BaseApiResponse<ProjectFlock>>(error)) {
+        return error.response?.data;
+      }
+      return undefined;
+    }
+  }
+
  /**
   * Approve single Project Flock
   */
@@ -2,6 +2,8 @@ import axios from 'axios';
 import type { AxiosError, AxiosRequestConfig } from 'axios';
 import { RequestOptions } from '@/services/http/base';

+import { redirectToSSO } from '@/lib/auth-helper';
+
 const BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL ?? '';
 const axiosClient = axios.create({ baseURL: BASE_URL, timeout: 10_000 });

@@ -9,8 +11,7 @@ axiosClient.interceptors.response.use(
  (response) => response,
  (error: AxiosError) => {
    if (error.response?.status === 401) {
-      const ssoLoginUrl = `${process.env.NEXT_PUBLIC_SSO_LOGIN_URL as string}?redirect_url=${window.location.href}`;
-      window.location.href = ssoLoginUrl;
+      redirectToSSO();
    }

    return Promise.reject(error);
--- a/Show More
+++ b/Show More