Merge branch 'dev/randy' into 'fix/FE/master-data-and-production'

[FIX/FE][US#33-74] Fix issue in master data and adjusmen in project flock

See merge request mbugroup/lti-web-client!120

.gitlab-ci.yml

@@ -2,17 +2,6 @@ stages:
   - build
   - deploy
 
-# ==========================================================
-# ✅ Global defaults
-# ==========================================================
-default:
-  tags:
-    - server-development-biznet
-  interruptible: true
-
-# ==========================================================
-# 🏗️ Build Template
-# ==========================================================
 .build_template: &build_template
   stage: build
   image: node:20-alpine
@@ -50,9 +39,6 @@ default:
       - out/
     expire_in: 1 week
 
-# ==========================================================
-# 🚀 Deploy Template
-# ==========================================================
 .deploy_template: &deploy_template
   stage: deploy
   image:
@@ -96,11 +82,11 @@ default:
       if [ "$STATUS" = "success" ]; then
         COLOR=3066993
         TITLE="✅ Deployment ${ENVIRONMENT_NAME} Succeeded"
-        DESC="Deployment job on branch \${CI_COMMIT_REF_NAME}\ completed successfully."
+        DESC="Deployment job on branch \`${CI_COMMIT_REF_NAME}\` completed successfully."
       else
         COLOR=15158332
         TITLE="❌ Deployment ${ENVIRONMENT_NAME} Failed"
-        DESC="Deployment job on branch \${CI_COMMIT_REF_NAME}\ encountered issues."
+        DESC="Deployment job on branch \`${CI_COMMIT_REF_NAME}\` encountered issues."
       fi
 
       jq -n \
@@ -128,9 +114,7 @@ default:
 
       curl -sS -H "Content-Type: application/json" -d @payload.json "$DISCORD_WEBHOOK_URL"
 
-# ==========================================================
-# ==== DEVELOPMENT (Branch development) ======
-# ==========================================================
+# ====== DEVELOPMENT (Branch development) ======
 build:dev:
   <<: *build_template
   rules:
@@ -156,9 +140,7 @@ deploy:dev:
     name: development
     url: https://dev-lti-erp.mbugroup.id
 
-# ==========================================================
 # ====== STAGING (Branch staging) ======
-# ==========================================================
 build:staging:
   <<: *build_template
   rules:
@@ -183,3 +165,25 @@ deploy:staging:
   environment:
     name: staging
     url: https://stg-lti-erp.mbugroup.id
+# ====== PRODUCTION ======
+# build:production:
+#   <<: *build_template
+#   rules:
+#     # pilih salah satu: pakai branch master ATAU pakai tags rilis
+#     - if: '$CI_COMMIT_BRANCH == "master"'
+#     # - if: '$CI_COMMIT_TAG'   # kalau mau rilis via tag, uncomment ini dan hapus baris di atas
+#   environment:
+#     name: production
+
+# deploy:production:
+#   <<: *deploy_template
+#   needs: ["build:production"]
+#   rules:
+#     - if: '$CI_COMMIT_BRANCH == "master"'
+#     # - if: '$CI_COMMIT_TAG'   # selaras dengan rule di build:production
+#   variables:
+#     S3_BUCKET: "lti-erp.mbugroup.id"
+#     CLOUDFRONT_DISTRIBUTION_ID: "ddfd"
+#   environment:
+#     name: production
+

package.json

@@ -15,34 +15,22 @@
     "@tanstack/match-sorter-utils": "^8.19.4",
     "@tanstack/react-table": "^8.21.3",
     "axios": "^1.12.2",
-    "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "cmdk": "^1.1.1",
-    "embla-carousel-react": "^8.6.0",
     "formik": "^2.4.6",
-    "input-otp": "^1.4.2",
     "jspdf": "^3.0.4",
     "jspdf-autotable": "^5.0.2",
-    "lucide-react": "^0.562.0",
     "moment": "^2.30.1",
     "next": "15.5.9",
-    "next-themes": "^0.4.6",
-    "radix-ui": "^1.4.3",
-    "react": "^19.1.2",
+    "react": "19.1.0",
     "react-day-picker": "^9.11.1",
-    "react-dom": "^19.1.2",
+    "react-dom": "19.1.0",
     "react-dropzone": "^14.3.8",
-    "react-hook-form": "^7.70.0",
     "react-hot-toast": "^2.6.0",
     "react-number-format": "^5.4.4",
-    "react-resizable-panels": "2.1.7",
     "react-select": "^5.10.2",
-    "recharts": "^3.6.0",
-    "sonner": "^2.0.7",
     "swr": "^2.3.6",
     "tailwind-merge": "^3.3.1",
     "use-debounce": "^10.0.6",
-    "vaul": "^1.1.2",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
     "yup": "^1.7.0",
     "zustand": "^5.0.8"

src/app/closing/detail/page.tsx

@@ -7,33 +7,18 @@ import ClosingDetail from '@/components/pages/closing/ClosingDetail';
 
 import { ClosingApi } from '@/services/api/closing';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { FlockApi } from '@/services/api/master-data';
-import { ProjectFlockApi } from '@/services/api/production/project-flock';
-import { ProjectFlockKandangApi } from '@/services/api/production';
 
 const ClosingDetailPage = () => {
   const router = useRouter();
   const searchParams = useSearchParams();
 
   const closingId = searchParams.get('closingId');
-  const kandangId = searchParams.get('kandangId'); // project flock kandang ID
 
   const { data: closing, isLoading: isLoadingClosing } = useSWR(
     closingId,
     (id: number) => ClosingApi.getGeneralInfo(id)
   );
 
-  // WORKAROUND - get flock data from closing ID
-  const { data: projectData, isLoading: isLoadingProject } = useSWR(
-    `flock-${closingId}`,
-    () => ProjectFlockApi.getSingle(Number(closingId))
-  );
-  // WORKAROUND - get kandang data from closing ID
-  const { data: kandangData, isLoading: isLoadingKandang } = useSWR(
-    kandangId ? `kandang-${closingId}-${kandangId}` : null,
-    () => ProjectFlockKandangApi.getSingle(Number(kandangId))
-  );
-
   const { data: salesData, isLoading: isLoadingSales } = useSWR(
     closingId ? `sales-${closingId}` : null,
     () => ClosingApi.getPenjualan(Number(closingId))
@@ -59,12 +44,7 @@ const ClosingDetailPage = () => {
     return;
   }
 
-  const isLoading =
-    isLoadingClosing ||
-    isLoadingSales ||
-    isLoadingHppEkspedisi ||
-    isLoadingProject ||
-    isLoadingKandang;
+  const isLoading = isLoadingClosing || isLoadingSales || isLoadingHppEkspedisi;
 
   return (
     <div className='w-full p-4 flex flex-row justify-center'>
@@ -80,12 +60,6 @@ const ClosingDetailPage = () => {
               ? hppEkspedisiData.data
               : undefined
           }
-          projectData={
-            isResponseSuccess(projectData) ? projectData.data : undefined
-          }
-          kandangData={
-            isResponseSuccess(kandangData) ? kandangData.data : undefined
-          }
         />
       )}
     </div>

src/app/daily-checklist/daily-checklist/page.tsx

@@ -1,11 +0,0 @@
-import { DailyChecklistContent } from '@/figma-make/components/pages/daily-checklist/DailyChecklistContent';
-
-const DailyChecklistPage = () => {
-  return (
-    <section className='w-full'>
-      <DailyChecklistContent />
-    </section>
-  );
-};
-
-export default DailyChecklistPage;

src/app/daily-checklist/dashboard/page.tsx

@@ -1,11 +0,0 @@
-import { Dashboard as DashboardDailyChecklist } from '@/figma-make/components/pages/dashboard/Dashboard';
-
-const DailyChecklistDashboardPage = () => {
-  return (
-    <section className='w-full'>
-      <DashboardDailyChecklist />
-    </section>
-  );
-};
-
-export default DailyChecklistDashboardPage;

src/app/daily-checklist/list-daily-checklist/detail/layout.tsx

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

src/app/daily-checklist/list-daily-checklist/detail/page.tsx

@@ -1,11 +0,0 @@
-import { DetailDailyChecklistContent } from '@/figma-make/components/pages/list-daily-checklist/detail/DetailDailyChecklistContent';
-
-const ListDailyChecklistDetailPage = () => {
-  return (
-    <section className='w-full'>
-      <DetailDailyChecklistContent />
-    </section>
-  );
-};
-
-export default ListDailyChecklistDetailPage;

src/app/daily-checklist/list-daily-checklist/page.tsx

@@ -1,11 +0,0 @@
-import { ListDailyChecklistContent } from '@/figma-make/components/pages/list-daily-checklist/ListDailyChecklistContent';
-
-const ListDailyChecklistPage = () => {
-  return (
-    <section className='w-full'>
-      <ListDailyChecklistContent />
-    </section>
-  );
-};
-
-export default ListDailyChecklistPage;

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

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

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

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

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

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

src/app/daily-checklist/reports/page.tsx

@@ -1,11 +0,0 @@
-import { DailyChecklistReportsContent } from '@/figma-make/components/pages/reports/DailyChecklistReportsContent';
-
-const DailyChecklistReportsPage = () => {
-  return (
-    <section className='w-full'>
-      <DailyChecklistReportsContent />
-    </section>
-  );
-};
-
-export default DailyChecklistReportsPage;

src/app/dashboard/page.tsx

@@ -1,7 +1,9 @@
-import DashboardProduction from '@/components/pages/dashboard/DashboardProduction';
-
 const Dashboard = () => {
-  return <DashboardProduction />;
+  return (
+    <section className='w-full p-4'>
+      <h1 className='text-3xl font-bold text-primary'>Dashboard</h1>
+    </section>
+  );
 };
 
 export default Dashboard;

src/app/expense/realization/page.tsx

@@ -37,7 +37,7 @@ const ExpenseRealization = () => {
   const isExpenseCanBeRealized =
     isResponseSuccess(expense) &&
     expense.data.latest_approval.action !== 'REJECTED' &&
-    expense.data.latest_approval.step_number === 4;
+    expense.data.latest_approval.step_number === 3;
 
   if (isResponseSuccess(expense) && !isExpenseCanBeRealized) {
     if (typeof window !== 'undefined') {

src/app/globals.css

@@ -1,7 +1,6 @@
 @import 'tailwindcss';
 @plugin "daisyui";
 @import '../styles/daisyui.css';
-@import '../figma-make/styles/theme.css';
 
 @plugin "daisyui/theme" {
   name: 'lti';

src/app/layout.tsx

@@ -3,7 +3,6 @@ import { Inter } from 'next/font/google';
 import '@/app/globals.css';
 
 import { Toaster } from 'react-hot-toast';
-import { Toaster as SonnerToaster } from '@/figma-make/components/base/sonner';
 import MainDrawer from '@/components/MainDrawer';
 import RequireAuth from '@/components/helper/RequireAuth';
 
@@ -36,7 +35,6 @@ export default function RootLayout({
         </RequireAuth>
 
         <Toaster />
-        <SonnerToaster position='top-right' />
       </body>
     </html>
   );

src/app/production/uniformity/add/page.tsx

@@ -1,7 +0,0 @@
-import UniformityForm from '@/components/pages/production/uniformity/form/UniformityForm';
-
-const AddUniformity = () => {
-  return <UniformityForm formType='add' />;
-};
-
-export default AddUniformity;

src/app/production/uniformity/detail/page.tsx

@@ -1,49 +0,0 @@
-'use client';
-
-import UniformityDetail from '@/components/pages/production/uniformity/detail/UniformityDetail';
-import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { UniformityApi } from '@/services/api/uniformity';
-import { useRouter, useSearchParams } from 'next/navigation';
-import useSWR from 'swr';
-
-const UniformityDetailPage = () => {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-
-  const uniformityId = searchParams.get('uniformityId');
-
-  const { data: uniformity, isLoading: isLoadingUniformity } = useSWR(
-    uniformityId,
-    (id: string) => UniformityApi.getUniformityDetail(parseInt(id))
-  );
-
-  if (!uniformityId) {
-    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 (!isLoadingUniformity && (!uniformity || isResponseError(uniformity))) {
-    router.replace('/404');
-    return;
-  }
-
-  return (
-    <div className='w-full h-full flex flex-col justify-center'>
-      {isLoadingUniformity && (
-        <div className='w-full flex flex-row justify-center items-center p-4 min-h-screen'>
-          <span className='loading loading-spinner loading-xl' />
-        </div>
-      )}
-      {isResponseSuccess(uniformity) && (
-        <UniformityDetail initialValues={uniformity.data} />
-      )}
-    </div>
-  );
-};
-
-export default UniformityDetailPage;

src/app/production/uniformity/layout.tsx

@@ -1,10 +0,0 @@
-import { ReactNode } from 'react';
-import UniformityPageWrapper from '@/components/pages/production/uniformity/UniformityPageWrapper';
-
-export default function UniformityLayout({
-  children,
-}: {
-  children: ReactNode;
-}) {
-  return <UniformityPageWrapper>{children}</UniformityPageWrapper>;
-}

src/app/production/uniformity/page.tsx

@@ -1,7 +0,0 @@
-import UniformityTable from '@/components/pages/production/uniformity/UniformityTable';
-
-const Uniformity = () => {
-  return <UniformityTable />;
-};
-
-export default Uniformity;

src/app/report/finance/page.tsx

@@ -1,7 +0,0 @@
-import FinanceTabs from '@/components/pages/report/finance/FinanceTabs';
-
-const Finance = () => {
-  return <FinanceTabs />;
-};
-
-export default Finance;

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

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

src/components/Badge.tsx

@@ -3,25 +3,29 @@
 import { HTMLAttributes, ReactNode } from 'react';
 
 import { cn } from '@/lib/helper';
-import type { Color, Variant, Size } from '@/types/theme';
 
 export interface BadgeProps
   extends Omit<HTMLAttributes<HTMLSpanElement>, 'className'> {
   children?: ReactNode;
   className?: {
     badge?: string;
-    status?: string;
   };
-  statusIndicator?: boolean;
-  variant?: Variant;
-  color?: Color;
-  size?: Size;
+  variant?: 'default' | 'outline' | 'ghost' | 'soft' | 'dash';
+  color?:
+    | 'neutral'
+    | 'primary'
+    | 'secondary'
+    | 'accent'
+    | 'info'
+    | 'success'
+    | 'warning'
+    | 'error';
+  size?: 'xs' | 'sm' | 'md' | 'lg' | 'xl';
 }
 
 const Badge = ({
   children,
   className,
-  statusIndicator = false,
   variant = 'default',
   color,
   size = 'md',
@@ -30,7 +34,7 @@ const Badge = ({
   const getBadgeClasses = () => {
     const baseClasses = 'badge';
 
-    const variantClasses: Record<Variant, string> = {
+    const variantClasses = {
       default: '',
       outline: 'badge-outline',
       ghost: 'badge-ghost',
@@ -38,7 +42,7 @@ const Badge = ({
       dash: 'badge-dash',
     };
 
-    const colorClasses: Record<Color, string> = {
+    const colorClasses = {
       neutral: 'badge-neutral',
       primary: 'badge-primary',
       secondary: 'badge-secondary',
@@ -47,10 +51,9 @@ const Badge = ({
       success: 'badge-success',
       warning: 'badge-warning',
       error: 'badge-error',
-      none: '',
     };
 
-    const sizeClasses: Record<Size, string> = {
+    const sizeClasses = {
       xs: 'badge-xs',
       sm: 'badge-sm',
       md: 'badge-md',
@@ -67,31 +70,8 @@ const Badge = ({
     );
   };
 
-  const getStatusClasses = () => {
-    if (!statusIndicator) return '';
-
-    const statusIndicatorClasses: Record<Color, string> = {
-      neutral: 'bg-neutral',
-      primary: 'bg-primary',
-      secondary: 'bg-secondary',
-      accent: 'bg-accent',
-      info: 'bg-info',
-      success: 'bg-success',
-      warning: 'bg-warning',
-      error: 'bg-error',
-      none: '',
-    };
-
-    return cn(
-      'w-2.5 h-2.5 rounded-full',
-      color && statusIndicatorClasses[color],
-      className?.status
-    );
-  };
-
   return (
     <span className={getBadgeClasses()} {...props}>
-      {statusIndicator && <span className={getStatusClasses()} />}
       {children}
     </span>
   );

src/components/Drawer.tsx

@@ -15,8 +15,6 @@ interface DrawerProps {
   className?: DrawerClassName;
   onBackdropClick?: () => void;
   closeOnBackdropClick?: boolean;
-  expandedContent?: ReactNode;
-  expandedWidth?: string;
 }
 
 type DrawerClassName = {
@@ -38,8 +36,6 @@ const Drawer = ({
   className,
   onBackdropClick,
   closeOnBackdropClick = true,
-  expandedContent,
-  expandedWidth = 'w-[400px]',
 }: DrawerProps) => {
   const getDrawerClassNames = (): DrawerClassName => {
     const baseClassNames = {
@@ -50,21 +46,12 @@ const Drawer = ({
       drawerSidebarContent: 'min-h-full bg-base-100',
     };
 
-    const getSidebarWidth = () => {
-      if (variant === 'sidebar') {
-        return expandedContent
-          ? 'w-full lg:min-w-[600px] lg:max-w-[600px]'
-          : 'w-full max-w-[300px] lg:w-[300px]';
-      }
-      return 'w-full sm:min-w-120 sm:w-fit';
-    };
-
     if (variant === 'sidebar') {
       return {
         ...baseClassNames,
         drawerSidebarContent: cn(
           baseClassNames.drawerSidebarContent,
-          getSidebarWidth()
+          'w-full max-w-[300px] lg:w-[300px]'
         ),
       };
     } else if (variant === 'right') {
@@ -73,11 +60,11 @@ const Drawer = ({
         drawer: cn(baseClassNames.drawer, 'drawer-end'),
         drawerSide: cn(
           baseClassNames.drawerSide,
-          'border-l border-solid border-gray-200 sm:drawer-side w-screen top-0 right-0 fixed z-21'
+          'border-l border-solid border-gray-200 drawer-side w-screen top-0 right-0 fixed z-21'
         ),
         drawerSidebarContent: cn(
           baseClassNames.drawerSidebarContent,
-          getSidebarWidth()
+          'w-full sm:min-w-120 sm:w-fit'
         ),
       };
     } else if (variant === 'left') {
@@ -89,7 +76,7 @@ const Drawer = ({
         ),
         drawerSidebarContent: cn(
           baseClassNames.drawerSidebarContent,
-          getSidebarWidth()
+          'w-full sm:min-w-120 sm:w-fit'
         ),
       };
     }
@@ -151,37 +138,14 @@ const Drawer = ({
           onClick={closeDrawer}
         />
 
-        {/* Sidebar Content - Full height container */}
+        {/* Sidebar Content */}
         <div
           className={cn(
-            'flex h-screen bg-base-100 overflow-hidden',
-            variant === 'right' && 'flex-row'
+            varianClassName?.drawerSidebarContent,
+            className?.drawerContent
           )}
         >
-          {/* Primary Sidebar Content */}
-          <div
-            className={cn(
-              varianClassName?.drawerSidebarContent,
-              className?.drawerContent,
-              'overflow-y-auto'
-            )}
-          >
-            {sidebarContent}
-          </div>
-
-          {/* Expanded Drawer (Right side, side-by-side) */}
-          {expandedContent && (
-            <div
-              className={cn(
-                'border-l border-gray-200 bg-white flex flex-col h-full',
-                expandedWidth
-              )}
-            >
-              <div className='overflow-y-auto flex-1 h-full'>
-                {expandedContent}
-              </div>
-            </div>
-          )}
+          {sidebarContent}
         </div>
       </div>
     </div>

src/components/FloatingActionsButton.tsx

@@ -39,8 +39,8 @@ const FloatingActionsButton = ({
   // Jika tidak ada baris yang dipilih, jangan tampilkan FAB
   const positionStyles =
     selectedRowIds.length > 0
-      ? 'bottom-[5%] opacity-100'
-      : 'bottom-[-5%] opacity-0';
+      ? 'bottom-[10%] opacity-100'
+      : 'bottom-[-10%] opacity-0';
 
   // Helper untuk menentukan gaya warna tombol approval
   const getApprovalColor = (action: 'APPROVED' | 'REJECTED') => {
@@ -60,7 +60,7 @@ const FloatingActionsButton = ({
     // Container utama FAB
     <div
       className={cn(
-        `fixed ${positionStyles} inset-x-1/2 -translate-x-1/2 z-50`,
+        `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'
       )}

src/components/MainDrawer.tsx

@@ -67,9 +67,7 @@ const MainDrawer = ({
   const pathname = usePathname();
   const { permissionCheck } = useAuth();
 
-  const formattedPathname = pathname.endsWith('/') ? pathname : `${pathname}/`;
-
-  const isPermitted = ROUTE_PERMISSIONS[formattedPathname]?.some((permission) =>
+  const isPermitted = ROUTE_PERMISSIONS[pathname]?.some((permission) =>
     permissionCheck(permission)
   );
 

src/components/helper/RequireAuth.tsx

@@ -5,7 +5,6 @@ import useSWR from 'swr';
 
 import { useAuth } from '@/services/hooks/useAuth';
 import { httpClientFetcher, SWRHttpKey } from '@/services/http/client';
-import { AuthApi } from '@/services/api/auth';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { BaseApiResponse, GetMeResponse } from '@/types/api/api-general';
 import { AxiosError } from 'axios';
@@ -29,8 +28,8 @@ const RequireAuth = ({ children }: RequireAuthProps) => {
   >('/sso/userinfo', httpClientFetcher, {
     shouldRetryOnError: false,
 
-    // refresh every 12 minutes
-    refreshInterval: 12 * 60 * 1000,
+    // refresh every 13 minutes
+    refreshInterval: 13 * 60 * 1000,
   });
 
   useEffect(() => {
@@ -56,25 +55,6 @@ const RequireAuth = ({ children }: RequireAuthProps) => {
     setIsLoadingUser(isLoadingUserResponse);
   }, [isLoadingUserResponse]);
 
-  useEffect(() => {
-    const interval = setInterval(
-      async () => {
-        await AuthApi.refresh();
-      },
-      12 * 60 * 1000
-    );
-
-    return () => clearInterval(interval);
-  }, []);
-
-  useEffect(() => {
-    const refreshUserSession = async () => {
-      await AuthApi.refresh();
-    };
-
-    refreshUserSession();
-  }, []);
-
   if (
     (isLoadingUserResponse && !userResponse && !userErrorResponse) ||
     (!userResponse && !userErrorResponse)
@@ -86,7 +66,7 @@ const RequireAuth = ({ children }: RequireAuthProps) => {
     );
   }
 
-  if (!isLoadingUserResponse && userErrorResponse) {
+  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>
@@ -94,7 +74,10 @@ const RequireAuth = ({ children }: RequireAuthProps) => {
           Please try refreshing the page or contact support if the problem
           persists.
         </p>
-        <button className='btn btn-primary' onClick={() => redirectToSSO()}>
+        <button
+          className='btn btn-primary'
+          onClick={() => window.location.reload()}
+        >
           Retry
         </button>
       </div>

src/components/helper/form/FormErrors.tsx

@@ -1,49 +0,0 @@
-import Alert from '@/components/Alert';
-import Button from '@/components/Button';
-import { Icon } from '@iconify/react';
-import { useState } from 'react';
-
-/**
- * Alert Unique Error List
- * @param formErrorList - Array of error messages
- * @param onClose - Function to close the alert
- */
-const AlertErrorList = ({
-  formErrorList,
-  onClose,
-}: {
-  formErrorList: string[];
-  onClose: () => void;
-}) => {
-  if (formErrorList.length === 0) return null;
-
-  return (
-    <Alert color='error' className='w-full flex flex-col gap-2 px-4 m-4'>
-      <div className='flex justify-between items-center gap-2 w-full'>
-        <div className='flex items-center gap-2'>
-          <Icon icon='material-symbols:error-outline' width={24} height={24} />
-          <span className='font-semibold'>
-            Terdapat {formErrorList.length} error pada form:
-          </span>
-        </div>
-        <Button
-          onClick={onClose}
-          variant='link'
-          className='ml-auto p-0 w-fit text-white'
-          color='none'
-        >
-          <Icon icon='material-symbols:close' width={24} height={24} />
-        </Button>
-      </div>
-      <ul className='list-disc list-inside pl-8 space-y-1 w-full'>
-        {formErrorList.map((error, index) => (
-          <li key={index} className='text-sm'>
-            {error}
-          </li>
-        ))}
-      </ul>
-    </Alert>
-  );
-};
-
-export default AlertErrorList;

src/components/input/FileInput.tsx

@@ -33,7 +33,6 @@ const FileInput = ({
   isError,
   errorMessage,
   disabled = false,
-  required = false,
   onChange,
   onBlur,
   readOnly = false,
@@ -57,13 +56,6 @@ const FileInput = ({
           )}
         >
           {label}
-          {required && (
-            <>
-              <span className='tooltip tooltip-error' data-tip='required'>
-                <span className='text-error'> *</span>
-              </span>
-            </>
-          )}
         </label>
       )}
 

src/components/modal/ConfirmationModal.tsx

@@ -8,13 +8,10 @@ import Button, { ButtonProps } from '@/components/Button';
 
 import { cn } from '@/lib/helper';
 
-export type IconPosition = 'left' | 'center' | 'right';
-
 export interface ConfirmationModalProps {
   ref: RefObject<HTMLDialogElement | null>;
   type?: 'info' | 'success' | 'error';
   text?: string;
-  subtitleText?: string;
   closeOnBackdrop?: boolean;
   primaryButton?: ButtonProps & {
     text?: string;
@@ -27,84 +24,17 @@ export interface ConfirmationModalProps {
     modalBox?: string;
   };
   children?: React.ReactNode;
-  iconSize?: number;
-  iconPosition?: IconPosition;
 }
 
-const iconConfig = {
-  info: {
-    icon: 'material-symbols:info-outline-rounded',
-    iconClassName: 'text-info-content',
-    bgClassName: 'bg-info',
-    outerRingClassName: 'bg-info/20',
-    borderClassName: 'border-info',
-  },
-  success: {
-    icon: 'heroicons:check',
-    iconClassName: 'text-white',
-    bgClassName: 'bg-[#00D390]',
-    outerRingClassName: 'bg-[#00D3901F]',
-    borderClassName: 'border-[#CCF7EB]',
-  },
-  error: {
-    icon: 'solar:danger-triangle-linear',
-    iconClassName: 'text-error-content',
-    bgClassName: 'bg-[#f03338]',
-    outerRingClassName: 'bg-[#f3cdcd]',
-    borderClassName: 'border-[#fff0ef]',
-  },
-} as const;
-
-const ConfirmationModalIcon = ({
-  type,
-  size = 24,
-}: {
-  type: 'info' | 'success' | 'error';
-  size?: number;
-}) => {
-  const config = iconConfig[type];
-
-  return (
-    <div className='flex items-center justify-center p-2'>
-      <div
-        className={cn(
-          'rounded-full border-4 p-1',
-          config.outerRingClassName,
-          config.borderClassName
-        )}
-      >
-        <div className={cn('rounded-full p-1', config.outerRingClassName)}>
-          <div
-            className={cn(
-              'rounded-full p-3 flex items-center justify-center',
-              config.bgClassName
-            )}
-          >
-            <Icon
-              icon={config.icon}
-              width={size}
-              height={size}
-              className={config.iconClassName}
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-
 const ConfirmationModal = ({
   ref,
   type = 'info',
   text,
-  subtitleText,
   closeOnBackdrop,
   primaryButton,
   secondaryButton,
   className,
   children,
-  iconSize = 32,
-  iconPosition = 'center',
 }: ConfirmationModalProps) => {
   const [isPrimaryButtonLoading, setIsPrimaryButtonLoading] = useState(false);
 
@@ -125,44 +55,47 @@ const ConfirmationModal = ({
   return (
     <Modal ref={ref} closeOnBackdrop={closeOnBackdrop} className={className}>
       <div className='w-full flex flex-col gap-4'>
-        {iconPosition === 'center' ? (
-          <>
-            <div className='w-fit mx-auto'>
-              <ConfirmationModalIcon type={type} size={iconSize} />
-            </div>
+        <div
+          className={cn(
+            'w-fit p-4 mx-auto flex flex-row justify-center items-center rounded-full',
+            {
+              'bg-error': type === 'error',
+              'bg-info': type === 'info',
+              'bg-success': type === 'success',
+            }
+          )}
+        >
+          {type === 'info' && (
+            <Icon
+              icon='material-symbols:info-outline-rounded'
+              width={64}
+              height={64}
+              className='text-info-content'
+            />
+          )}
 
-            <p className='text-center font-medium'>
-              {text ?? 'Apakah anda yakin ingin melakukan hal ini?'}
-            </p>
+          {type === 'success' && (
+            <Icon
+              icon='qlementine-icons:success-12'
+              width={64}
+              height={64}
+              className='text-success-content'
+            />
+          )}
 
-            {subtitleText && (
-              <p className='text-center text-sm text-gray-400'>
-                {subtitleText}
-              </p>
-            )}
-          </>
-        ) : (
-          <div
-            className={cn('flex flex-row items-center gap-4', {
-              'flex-row': iconPosition === 'left',
-              'flex-row-reverse': iconPosition === 'right',
-            })}
-          >
-            <div className='w-fit'>
-              <ConfirmationModalIcon type={type} size={iconSize} />
-            </div>
+          {type === 'error' && (
+            <Icon
+              icon='solar:danger-triangle-linear'
+              width={64}
+              height={64}
+              className='text-error-content'
+            />
+          )}
+        </div>
 
-            <div className='flex flex-col gap-1'>
-              <p className='font-medium'>
-                {text ?? 'Apakah anda yakin ingin melakukan hal ini?'}
-              </p>
-
-              {subtitleText && (
-                <p className='text-sm text-gray-400'>{subtitleText}</p>
-              )}
-            </div>
-          </div>
-        )}
+        <p className='text-center font-medium'>
+          {text ?? 'Apakah anda yakin ingin melakukan hal ini?'}
+        </p>
 
         {children && <div className='w-full'>{children}</div>}
 
@@ -170,7 +103,7 @@ const ConfirmationModal = ({
           {secondaryButton && secondaryButton.text && (
             <Button
               {...secondaryButton}
-              variant='outline'
+              variant='ghost'
               color={secondaryButton?.color}
               isLoading={secondaryButton?.isLoading}
               disabled={

src/components/pages/ApprovalSteps.tsx

@@ -309,7 +309,7 @@ const useApprovalSteps = ({
   moduleId: string;
   params?: {
     page?: number;
-    limit: number | string;
+    limit: number;
     search?: string;
     group_step_number?: boolean;
   };

src/components/pages/closing/ClosingDetail.tsx

@@ -19,16 +19,12 @@ import ClosingOverheadTabContent from '@/components/pages/closing/ClosingOverhea
 import ClosingFinanceTabContent from '@/components/pages/closing/ClosingFinanceTabContent';
 import SalesReportTable from '@/components/pages/closing/sale/SalesReportTable';
 import HppExpeditionReportTable from './hpp-ekspedisi/HppExpeditionReportTable';
-import ClosingKandangList from '@/components/pages/closing/ClosingKandangList';
-import { ProjectFlock } from '@/types/api/production/project-flock';
-import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
+
 interface ClosingDetailProps {
   id: number;
   initialValue?: ClosingGeneralInformation;
   salesData?: BaseClosingSales;
   hppExpeditionData?: ClosingHppExpedition;
-  projectData?: ProjectFlock;
-  kandangData?: ProjectFlockKandang;
 }
 
 const ClosingDetail: React.FC<ClosingDetailProps> = ({
@@ -36,8 +32,6 @@ const ClosingDetail: React.FC<ClosingDetailProps> = ({
   initialValue,
   salesData,
   hppExpeditionData,
-  projectData,
-  kandangData,
 }) => {
   const [activeTab, setActiveTab] = useState<string>('sapronak');
 
@@ -51,12 +45,7 @@ const ClosingDetail: React.FC<ClosingDetailProps> = ({
       {
         id: 'perhitunganSapronak',
         label: 'Perhitungan Sapronak',
-        content: (
-          <ClosingSapronakCalculationTabContent
-            closingGeneralInformation={initialValue}
-            projectFlockId={id}
-          />
-        ),
+        content: <ClosingSapronakCalculationTabContent projectFlockId={id} />,
       },
       {
         id: 'penjualan',
@@ -93,9 +82,7 @@ const ClosingDetail: React.FC<ClosingDetailProps> = ({
       <section className='w-full max-w-7xl pb-16'>
         <header className='flex flex-col gap-4'>
           <Button
-            href={
-              !kandangData ? '/closing' : `/closing/detail/?closingId=${id}`
-            }
+            href='/closing'
             variant='link'
             className='w-fit p-0 text-primary'
           >
@@ -106,18 +93,7 @@ const ClosingDetail: React.FC<ClosingDetailProps> = ({
           <h1 className='text-2xl font-bold text-center'>Detail Closing</h1>
         </header>
 
-        <ClosingGeneralInformationTable
-          initialValue={initialValue}
-          projectData={projectData}
-          kandangData={kandangData}
-        />
-
-        {!kandangData && (
-          <ClosingKandangList
-            initialValue={initialValue}
-            projectData={projectData}
-          />
-        )}
+        <ClosingGeneralInformationTable initialValue={initialValue} />
 
         <Tabs
           activeTabId={activeTab}

src/components/pages/closing/ClosingFinanceTable.tsx

@@ -23,14 +23,6 @@ type HppTableRow =
       type?: never;
       budgeting?: never;
       realization?: never;
-    }
-  | {
-      type: string;
-      group_name: string;
-      group_index: number;
-      isGroupHeader: false;
-      budgeting?: { rp_per_bird: number; rp_per_kg: number; amount: number };
-      realization?: { rp_per_bird: number; rp_per_kg: number; amount: number };
     };
 
 type ProfitLossTableRow =
@@ -60,117 +52,25 @@ const ClosingFinanceTable = ({
     () => ClosingApi.getFinance(projectFlockId)
   );
 
-  const staticHppRows: Array<{
-    group_name: string;
-    type: string;
-    group_index: number;
-  }> = [
-    {
-      group_name: 'HPP dan Pengeluaran',
-      type: 'Pembelian PAKAN',
-      group_index: 0,
-    },
-    {
-      group_name: 'HPP dan Pengeluaran',
-      type: 'Pembelian STARTER',
-      group_index: 0,
-    },
-    {
-      group_name: 'HPP dan Pengeluaran',
-      type: 'Pembelian DOC',
-      group_index: 0,
-    },
-    {
-      group_name: 'HPP dan Pengeluaran',
-      type: 'Pembelian PULLET',
-      group_index: 0,
-    },
-    {
-      group_name: 'HPP dan Pengeluaran',
-      type: 'Pembelian LAYER',
-      group_index: 0,
-    },
-    {
-      group_name: 'HPP dan Bahan Baku',
-      type: 'Pengeluaran Overhead',
-      group_index: 1,
-    },
-    {
-      group_name: 'HPP dan Bahan Baku',
-      type: 'Beban Ekspedisi',
-      group_index: 1,
-    },
-  ];
-
-  const hppTableData: HppTableRow[] = [
-    {
-      group_name: 'HPP dan Pengeluaran',
-      group_index: 0,
-      isGroupHeader: true as const,
-    },
-    ...staticHppRows
-      .filter((row) => row.group_index === 0)
-      .map((staticRow) => {
-        const apiData = isResponseSuccess(finance)
-          ? finance.data.hpp_purchases.hpp
-              .find((g) => g.group_name === staticRow.group_name)
-              ?.data.find((d) => d.type === staticRow.type)
-          : null;
-
-        return {
-          group_name: staticRow.group_name,
-          group_index: staticRow.group_index,
-          type: staticRow.type,
-          budgeting: apiData?.budgeting || {
-            rp_per_bird: 0,
-            rp_per_kg: 0,
-            amount: 0,
-          },
-          realization: apiData?.realization || {
-            rp_per_bird: 0,
-            rp_per_kg: 0,
-            amount: 0,
-          },
+  const hppTableData: HppTableRow[] = isResponseSuccess(finance)
+    ? finance.data.hpp_purchases.hpp.flatMap((hpp, groupIndex) => [
+        // Group header row
+        {
+          group_name: hpp.group_name,
+          group_index: groupIndex,
+          isGroupHeader: true as const,
+        },
+        // Data rows
+        ...hpp.data.map((item) => ({
+          group_name: hpp.group_name,
+          group_index: groupIndex,
+          type: item.type,
+          budgeting: item.budgeting,
+          realization: item.realization,
           isGroupHeader: false as const,
-        };
-      }),
-    {
-      group_name: 'HPP dan Bahan Baku',
-      group_index: 1,
-      isGroupHeader: true as const,
-    },
-    ...staticHppRows
-      .filter((row) => row.group_index === 1)
-      .map((staticRow) => {
-        const apiData = isResponseSuccess(finance)
-          ? finance.data.hpp_purchases.hpp
-              .find((g) => g.group_name === staticRow.group_name)
-              ?.data.find((d) => d.type === staticRow.type)
-          : null;
-
-        return {
-          group_name: staticRow.group_name,
-          group_index: staticRow.group_index,
-          type: staticRow.type,
-          budgeting: apiData?.budgeting || {
-            rp_per_bird: 0,
-            rp_per_kg: 0,
-            amount: 0,
-          },
-          realization: apiData?.realization || {
-            rp_per_bird: 0,
-            rp_per_kg: 0,
-            amount: 0,
-          },
-          isGroupHeader: false as const,
-        };
-      }),
-    {
-      group_name: 'HPP',
-      group_index: 2,
-      isGroupHeader: true as const,
-    },
-  ];
+        })),
+      ])
+    : [];
 
   const profitLossTableData: ProfitLossTableRow[] = isResponseSuccess(finance)
     ? [
@@ -317,8 +217,8 @@ const ClosingFinanceTable = ({
                         return props.column.id === 'budgeting_rp_per_bird' &&
                           isResponseSuccess(finance)
                           ? formatCurrency(
-                              finance.data.hpp_purchases.summary_hpp?.budgeting
-                                ?.rp_per_bird || 0
+                              finance.data.hpp_purchases.summary_hpp.budgeting
+                                .rp_per_bird || 0
                             )
                           : '-';
                       },
@@ -333,8 +233,8 @@ const ClosingFinanceTable = ({
                         return props.column.id === 'budgeting_rp_per_kg' &&
                           isResponseSuccess(finance)
                           ? formatCurrency(
-                              finance.data.hpp_purchases.summary_hpp?.budgeting
-                                ?.rp_per_kg || 0
+                              finance.data.hpp_purchases.summary_hpp.budgeting
+                                .rp_per_kg || 0
                             )
                           : '-';
                       },
@@ -349,8 +249,8 @@ const ClosingFinanceTable = ({
                         return props.column.id === 'budgeting_amount' &&
                           isResponseSuccess(finance)
                           ? formatCurrency(
-                              finance.data.hpp_purchases.summary_hpp?.budgeting
-                                ?.amount || 0
+                              finance.data.hpp_purchases.summary_hpp.budgeting
+                                .amount || 0
                             )
                           : '-';
                       },
@@ -371,8 +271,8 @@ const ClosingFinanceTable = ({
                         return props.column.id === 'realization_rp_per_bird' &&
                           isResponseSuccess(finance)
                           ? formatCurrency(
-                              finance.data.hpp_purchases.summary_hpp
-                                ?.realization?.rp_per_bird || 0
+                              finance.data.hpp_purchases.summary_hpp.realization
+                                .rp_per_bird || 0
                             )
                           : '-';
                       },
@@ -387,8 +287,8 @@ const ClosingFinanceTable = ({
                         return props.column.id === 'realization_rp_per_kg' &&
                           isResponseSuccess(finance)
                           ? formatCurrency(
-                              finance.data.hpp_purchases.summary_hpp
-                                ?.realization?.rp_per_kg || 0
+                              finance.data.hpp_purchases.summary_hpp.realization
+                                .rp_per_kg || 0
                             )
                           : '-';
                       },
@@ -403,8 +303,8 @@ const ClosingFinanceTable = ({
                         return props.column.id === 'realization_amount' &&
                           isResponseSuccess(finance)
                           ? formatCurrency(
-                              finance.data.hpp_purchases.summary_hpp
-                                ?.realization?.amount || 0
+                              finance.data.hpp_purchases.summary_hpp.realization
+                                .amount || 0
                             )
                           : '-';
                       },

src/components/pages/closing/ClosingGeneralInformationTable.tsx

@@ -1,29 +1,12 @@
 import { ClosingGeneralInformation } from '@/types/api/closing';
-import { ProjectFlock } from '@/types/api/production/project-flock';
-import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
-import { useMemo } from 'react';
 
 interface ClosingGeneralInformationProps {
   initialValue?: ClosingGeneralInformation;
-  projectData?: ProjectFlock;
-  kandangData?: ProjectFlockKandang;
 }
 
 const ClosingGeneralInformationTable = ({
   initialValue,
-  projectData,
-  kandangData,
 }: ClosingGeneralInformationProps) => {
-  const chickinPopulation = useMemo(() => {
-    if (kandangData) {
-      return kandangData?.chickins?.reduce(
-        (acc, chickin) => acc + chickin.usage_qty,
-        0
-      );
-    }
-    return 0;
-  }, [kandangData]);
-
   return (
     <div className='w-full my-4 @container'>
       <div className='flex flex-col @sm:flex-row gap-4'>
@@ -34,9 +17,7 @@ const ClosingGeneralInformationTable = ({
                 <tr>
                   <td>Lokasi</td>
                   <td>:</td>
-                  <td>
-                    {initialValue?.location_name ?? projectData?.location?.name}
-                  </td>
+                  <td>{initialValue?.location_name}</td>
                 </tr>
                 <tr>
                   <td>Periode</td>
@@ -44,22 +25,14 @@ const ClosingGeneralInformationTable = ({
                   <td>{initialValue?.period}</td>
                 </tr>
                 <tr>
-                  <td>Project Flock</td>
+                  <td>Kategori</td>
                   <td>:</td>
-                  <td>
-                    {initialValue?.project_flock?.name ??
-                      projectData?.flock_name}
-                  </td>
+                  <td>{initialValue?.project_category}</td>
                 </tr>
                 <tr>
                   <td>Populasi</td>
                   <td>:</td>
-                  <td>
-                    {!kandangData
-                      ? (initialValue?.population ?? 0)
-                      : (chickinPopulation ?? 0)}{' '}
-                    Ekor
-                  </td>
+                  <td>{initialValue?.population} Ekor</td>
                 </tr>
                 <tr>
                   <td>Jenis Project</td>
@@ -67,13 +40,9 @@ const ClosingGeneralInformationTable = ({
                   <td>{initialValue?.project_type}</td>
                 </tr>
                 <tr className='table-row @sm:hidden'>
-                  <td>Kandang {!kandangData && 'Aktif'}</td>
+                  <td>Kandang Aktif</td>
                   <td>:</td>
-                  <td>
-                    {!kandangData
-                      ? `${initialValue?.active_house_count} Kandang`
-                      : kandangData?.kandang?.name}
-                  </td>
+                  <td>{initialValue?.active_house_count} Kandang</td>
                 </tr>
                 <tr className='table-row @sm:hidden'>
                   <td>Status Pembayaran Penjualan</td>
@@ -100,13 +69,9 @@ const ClosingGeneralInformationTable = ({
             <table className='table table-zebra table-sm'>
               <tbody>
                 <tr>
-                  <td>Kandang {!kandangData && 'Aktif'}</td>
+                  <td>Kandang Aktif</td>
                   <td>:</td>
-                  <td>
-                    {!kandangData
-                      ? `${initialValue?.active_house_count} Kandang`
-                      : kandangData?.kandang?.name}
-                  </td>
+                  <td>{initialValue?.active_house_count} Kandang</td>
                 </tr>
                 <tr>
                   <td>Status Pembayaran Penjualan</td>

src/components/pages/closing/ClosingKandangList.tsx

@@ -1,37 +0,0 @@
-import Button from '@/components/Button';
-import { ClosingGeneralInformation } from '@/types/api/closing';
-import { ProjectFlock } from '@/types/api/production/project-flock';
-
-const ClosingKandangList = ({
-  initialValue,
-  projectData,
-}: {
-  initialValue?: ClosingGeneralInformation;
-  projectData?: ProjectFlock;
-}) => {
-  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'>
-            <h1 className='font-bold my-4'>Kandang</h1>
-            <div className='flex flex-wrap gap-2 mb-4'>
-              {projectData?.kandangs?.map((kandang) => (
-                <Button
-                  key={kandang.id}
-                  variant='outline'
-                  href={`/closing/detail/?closingId=${initialValue?.flock_id}&kandangId=${kandang.project_flock_kandang_id}`}
-                  className='min-w-32'
-                >
-                  {kandang.name}
-                </Button>
-              ))}
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default ClosingKandangList;

src/components/pages/closing/ClosingProductionDataTabContent.tsx

@@ -96,6 +96,11 @@ const ClosingProductionDataTabContent = ({
                 value={formatNumber(purchase.feed_used)}
                 unit='Kg'
               />
+              <DataRow
+                label='Pakan Terpakai per Ekor'
+                value={formatNumber(purchase.feed_used_per_head)}
+                unit='Kg'
+              />
             </div>
           </section>
 
@@ -119,12 +124,14 @@ const ClosingProductionDataTabContent = ({
                 />
                 <DataRow
                   label='Bobot Rata-Rata'
-                  value={formatNumber(sales.chicken.avg_weight)}
+                  value={formatNumber(sales.chicken.average_weight)}
                   unit='Kg/Ekor'
                 />
                 <DataRow
                   label='Harga Jual Rata-Rata'
-                  value={formatNumber(sales.chicken.avg_selling_price)}
+                  value={formatNumber(
+                    sales.chicken.chicken_average_selling_price
+                  )}
                   unit='Rupiah'
                 />
               </div>
@@ -141,17 +148,17 @@ const ClosingProductionDataTabContent = ({
                     />
                     <DataRow
                       label='Telur (Kg)'
-                      value={formatNumber(sales.egg.egg_mass)}
+                      value={formatNumber(sales.egg.egg_mass_kg)}
                       unit='Kg'
                     />
                     <DataRow
                       label='Berat Telur Rata-Rata'
-                      value={formatNumber(sales.egg.avg_egg_weight)}
+                      value={formatNumber(sales.egg.average_egg_weight_kg)}
                       unit='Kg'
                     />
                     <DataRow
                       label='Harga Jual Telur Rata-Rata'
-                      value={formatNumber(sales.egg.avg_selling_price)}
+                      value={formatNumber(sales.egg.egg_average_selling_price)}
                       unit='Rupiah'
                     />
                   </div>
@@ -184,37 +191,17 @@ const ClosingProductionDataTabContent = ({
               />
               <DataRow
                 label='Mortalitas Std'
-                value={formatNumber(performance.mor_std)}
+                value={formatNumber(performance.mortality_std)}
                 unitClassName='hidden'
               />
               <DataRow
                 label='Mortalitas Act'
-                value={formatNumber(performance.mor_act)}
+                value={formatNumber(performance.mortality_act)}
                 unitClassName='hidden'
               />
               <DataRow
                 label='DEFF Mortalitas'
-                value={formatNumber(performance.mor_diff)}
-                unitClassName='hidden'
-              />
-              <DataRow
-                label='AWG Std'
-                value={formatNumber(performance.awg_std)}
-                unit='Gr/Hari'
-              />
-              <DataRow
-                label='AWG Act'
-                value={formatNumber(performance.awg_act)}
-                unit='Gr/Hari'
-              />
-              <DataRow
-                label='Feed Intake Std'
-                value={formatNumber(performance.feed_intake_std)}
-                unitClassName='hidden'
-              />
-              <DataRow
-                label='Feed Intake Act'
-                value={formatNumber(performance.feed_intake)}
+                value={formatNumber(performance.deff_mortality)}
                 unitClassName='hidden'
               />
               <DataRow
@@ -229,70 +216,14 @@ const ClosingProductionDataTabContent = ({
               />
               <DataRow
                 label='DEFF FCR'
-                value={formatNumber(performance.fcr_diff)}
+                value={formatNumber(performance.deff_fcr)}
                 unitClassName='hidden'
               />
-
-              {/* Laying Specific Fields */}
-              {performance.hen_day_act !== undefined && (
-                <>
-                  <DataRow
-                    label='Hen Day Std'
-                    value={formatNumber(performance.hen_day_std!)}
-                    unit='%'
-                  />
-                  <DataRow
-                    label='Hen Day Act'
-                    value={formatNumber(performance.hen_day_act)}
-                    unit='%'
-                  />
-                </>
-              )}
-
-              {performance.egg_mass !== undefined && (
-                <>
-                  <DataRow
-                    label='Egg Mass Std'
-                    value={formatNumber(performance.egg_mass_std!)}
-                    unit='Kg'
-                  />
-                  <DataRow
-                    label='Egg Mass Act'
-                    value={formatNumber(performance.egg_mass)}
-                    unit='Kg'
-                  />
-                </>
-              )}
-
-              {performance.egg_weight !== undefined && (
-                <>
-                  <DataRow
-                    label='Egg Weight Std'
-                    value={formatNumber(performance.egg_weight_std!)}
-                    unit='Gr'
-                  />
-                  <DataRow
-                    label='Egg Weight Act'
-                    value={formatNumber(performance.egg_weight)}
-                    unit='Gr'
-                  />
-                </>
-              )}
-
-              {performance.hen_housed_act !== undefined && (
-                <>
-                  <DataRow
-                    label='Hen Housed Std'
-                    value={formatNumber(performance.hen_housed_std!)}
-                    unit='%'
-                  />
-                  <DataRow
-                    label='Hen Housed Act'
-                    value={formatNumber(performance.hen_housed_act)}
-                    unit='%'
-                  />
-                </>
-              )}
+              <DataRow
+                label='AWG'
+                value={formatNumber(performance.awg)}
+                unit='Gr/Hari'
+              />
             </div>
           </section>
         </div>

src/components/pages/closing/ClosingSapronakCalculationTabContent.tsx

@@ -1,25 +1,21 @@
 'use client';
 
+import ClosingIncomingSapronaksTable from '@/components/pages/closing/ClosingIncomingSapronaksTable';
+import ClosingOutgoingSapronaksTable from '@/components/pages/closing/ClosingOutgoingSapronaksTable';
 import ClosingSapronakCalculationTable from '@/components/pages/closing/ClosingSapronakCalculationTable';
-import { ClosingGeneralInformation } from '@/types/api/closing';
 
 interface ClosingSapronakCalculationTabContentProps {
   projectFlockId?: number;
-  closingGeneralInformation?: ClosingGeneralInformation;
 }
 
 const ClosingSapronakCalculationTabContent = ({
   projectFlockId,
-  closingGeneralInformation,
 }: ClosingSapronakCalculationTabContentProps) => {
   return (
     <div className='flex flex-col gap-4'>
       {projectFlockId && (
         <>
-          <ClosingSapronakCalculationTable
-            closingGeneralInformation={closingGeneralInformation}
-            projectFlockId={projectFlockId}
-          />
+          <ClosingSapronakCalculationTable projectFlockId={projectFlockId} />
         </>
       )}
     </div>

src/components/pages/closing/ClosingSapronakCalculationTable.tsx

@@ -3,7 +3,7 @@
 import Card from '@/components/Card';
 
 import Table from '@/components/Table';
-import { formatCurrency, formatDate, formatNumber } from '@/lib/helper';
+import { cn, formatCurrency, formatNumber } from '@/lib/helper';
 import {
   RowSapronakCalculation,
   TotalSapronakCalculation,
@@ -13,24 +13,19 @@ import { useMemo } from 'react';
 import useSWR from 'swr';
 import { ClosingApi } from '@/services/api/closing';
 import { isResponseSuccess } from '@/lib/api-helper';
-import { ClosingGeneralInformation } from '@/types/api/closing';
-import { useSearchParams } from 'next/navigation';
 
 interface ClosingSapronakCalculationTableProps {
+  type?: 'detail';
   projectFlockId: number;
-  closingGeneralInformation?: ClosingGeneralInformation;
 }
 
 const ClosingSapronakCalculationTable = ({
+  type,
   projectFlockId,
-  closingGeneralInformation,
 }: ClosingSapronakCalculationTableProps) => {
-  const searchParams = useSearchParams();
-  const kandangId = searchParams.get('kandangId');
-
   const { data: sapronakCalculation, isLoading } = useSWR(
-    `/closing/sapronak-calculation/${projectFlockId}${kandangId ? `/${kandangId}` : ''}`,
-    () => ClosingApi.getPerhitunganSapronak(projectFlockId, Number(kandangId)),
+    `/closing/sapronak-calculation/${projectFlockId}`,
+    () => ClosingApi.getPerhitunganSapronak(projectFlockId),
     {
       keepPreviousData: true,
     }
@@ -42,121 +37,101 @@ const ClosingSapronakCalculationTable = ({
   ): ColumnDef<RowSapronakCalculation>[] => [
     {
       header: 'Tanggal',
-      accessorKey: 'date',
-      cell: (props) =>
-        props.row.original.date
-          ? formatDate(props.row.original.date, 'DD MMM YYYY')
-          : '-',
+      accessorKey: 'tanggal',
+      cell: (props) => (props.getValue() as string) || '-',
       footer: 'Total',
     },
     {
       header: 'No. Referensi',
-      accessorKey: 'reference_number',
-      cell: (props) => (props.row.original.reference_number as string) || '-',
+      accessorKey: 'no_referensi',
+      cell: (props) => (props.getValue() as string) || '-',
       footer: '',
     },
     {
       header: 'QTY Masuk',
-      accessorKey: 'qty_in',
-      cell: (props) =>
-        props.row.original.qty_in
-          ? formatNumber(props.row.original.qty_in as number)
-          : '0',
+      accessorKey: 'qty_masuk',
+      cell: (props) => formatNumber(props.getValue() as number),
       footer: total
         ? () => (
             <div className='font-semibold text-gray-900'>
-              {total?.qty_in ? formatNumber(total?.qty_in) : '0'}
+              {formatNumber(total.qty_masuk)}
             </div>
           )
         : '',
     },
     {
       header: 'QTY Keluar',
-      accessorKey: 'qty_out',
-      cell: (props) =>
-        props.row.original.qty_out
-          ? formatNumber(props.row.original.qty_out as number)
-          : '0',
+      accessorKey: 'qty_keluar',
+      cell: (props) => formatNumber(props.getValue() as number),
       footer: total
         ? () => (
             <div className='font-semibold text-gray-900'>
-              {total?.qty_out ? formatNumber(total?.qty_out) : '0'}
+              {formatNumber(total.qty_keluar)}
             </div>
           )
         : '',
     },
     {
       header: 'QTY Pakai',
-      accessorKey: 'qty_used',
-      cell: (props) =>
-        props.row.original.qty_used
-          ? formatNumber(props.row.original.qty_used as number)
-          : '0',
+      accessorKey: 'qty_pakai',
+      cell: (props) => formatNumber(props.getValue() as number),
       footer: total
         ? () => (
             <div className='font-semibold text-gray-900'>
-              {total?.qty_used ? formatNumber(total?.qty_used) : '0'}
+              {formatNumber(total.qty_pakai)}
             </div>
           )
         : '',
     },
     {
       header: 'Uraian',
-      accessorKey: 'description',
-      cell: (props) => (props.row.original.description as string) || '-',
+      accessorKey: 'uraian',
+      cell: (props) => (props.getValue() as string) || '-',
       footer: '',
     },
     {
       header: 'Kategori Produk',
-      accessorKey: 'product_category',
-      cell: (props) => (props.row.original.product_category as string) || '-',
+      accessorKey: 'kategori_produk',
+      cell: (props) => (props.getValue() as string) || '-',
       footer: '',
     },
     {
       header: 'Harga Beli/Qty (Rp)',
-      accessorKey: 'unit_price',
-      cell: (props) =>
-        props.row.original.unit_price
-          ? formatCurrency(props.row.original.unit_price as number)
-          : '-',
+      accessorKey: 'harga_beli_per_qty',
+      cell: (props) => formatCurrency(props.getValue() as number),
       footer: total
         ? () => (
             <div className='font-semibold text-gray-900'>
-              {total?.avg_unit_price
-                ? formatCurrency(total?.avg_unit_price)
-                : '-'}
+              {formatCurrency(total.harga_beli_per_qty)}
             </div>
           )
         : '',
     },
     {
       header: 'Total Harga (Rp)',
-      accessorKey: 'total_amount',
-      cell: (props) =>
-        props.row.original.total_amount
-          ? formatCurrency(props.row.original.total_amount as number)
-          : '-',
+      accessorKey: 'total_harga',
+      cell: (props) => formatCurrency(props.getValue() as number),
       footer: total
         ? () => (
             <div className='font-semibold text-gray-900'>
-              {total?.total_amount ? formatCurrency(total?.total_amount) : '-'}
+              {formatCurrency(total.total_harga)}
             </div>
           )
         : '',
     },
     {
       header: 'Keterangan',
-      accessorKey: 'notes',
-      cell: (props) => (props.row.original.notes as string) || '-',
+      accessorKey: 'keterangan',
+      cell: (props) => (props.getValue() as string) || '-',
       footer: '',
     },
   ];
 
   // Memoize columns untuk setiap kategori
-  const docColumns = useMemo(
+  const docBroilerColumns = useMemo(
     () =>
       isResponseSuccess(sapronakCalculation)
-        ? createColumns(sapronakCalculation.data?.doc?.total)
+        ? createColumns(sapronakCalculation.data?.doc_broiler.total)
         : createColumns(),
     [sapronakCalculation]
   );
@@ -164,7 +139,7 @@ const ClosingSapronakCalculationTable = ({
   const ovkColumns = useMemo(
     () =>
       isResponseSuccess(sapronakCalculation)
-        ? createColumns(sapronakCalculation.data?.ovk?.total)
+        ? createColumns(sapronakCalculation.data?.ovk.total)
         : createColumns(),
     [sapronakCalculation]
   );
@@ -172,20 +147,15 @@ const ClosingSapronakCalculationTable = ({
   const pakanColumns = useMemo(
     () =>
       isResponseSuccess(sapronakCalculation)
-        ? createColumns(sapronakCalculation.data?.pakan?.total)
+        ? createColumns(sapronakCalculation.data?.pakan.total)
         : createColumns(),
     [sapronakCalculation]
   );
 
   return (
     <div className='flex flex-col gap-4'>
-      {/* Table DOC jika kategori Project Flock Growing */}
       <Card
-        title={
-          closingGeneralInformation?.project_type == 'GROWING'
-            ? 'DOC'
-            : 'Pullet'
-        }
+        title='DOC Broiler'
         collapsible
         defaultCollapsed={false}
         className={{
@@ -196,17 +166,14 @@ const ClosingSapronakCalculationTable = ({
         <Table<RowSapronakCalculation>
           data={
             isResponseSuccess(sapronakCalculation)
-              ? (sapronakCalculation.data?.doc?.rows ?? [])
+              ? (sapronakCalculation.data?.doc_broiler.rows ?? [])
               : []
           }
-          columns={docColumns}
+          columns={docBroilerColumns}
           className={{
             containerClassName: 'my-4',
           }}
-          renderFooter={
-            isResponseSuccess(sapronakCalculation) &&
-            sapronakCalculation.data?.doc?.rows.length > 0
-          }
+          renderFooter={isResponseSuccess(sapronakCalculation)}
         />
       </Card>
 
@@ -222,17 +189,14 @@ const ClosingSapronakCalculationTable = ({
         <Table<RowSapronakCalculation>
           data={
             isResponseSuccess(sapronakCalculation)
-              ? (sapronakCalculation.data?.ovk?.rows ?? [])
+              ? (sapronakCalculation.data?.ovk.rows ?? [])
               : []
           }
           columns={ovkColumns}
           className={{
             containerClassName: 'my-4',
           }}
-          renderFooter={
-            isResponseSuccess(sapronakCalculation) &&
-            sapronakCalculation.data?.ovk?.rows.length > 0
-          }
+          renderFooter={isResponseSuccess(sapronakCalculation)}
         />
       </Card>
 
@@ -248,17 +212,14 @@ const ClosingSapronakCalculationTable = ({
         <Table<RowSapronakCalculation>
           data={
             isResponseSuccess(sapronakCalculation)
-              ? (sapronakCalculation.data?.pakan?.rows ?? [])
+              ? (sapronakCalculation.data?.pakan.rows ?? [])
               : []
           }
           columns={pakanColumns}
           className={{
             containerClassName: 'my-4',
           }}
-          renderFooter={
-            isResponseSuccess(sapronakCalculation) &&
-            sapronakCalculation.data?.pakan?.rows.length > 0
-          }
+          renderFooter={isResponseSuccess(sapronakCalculation)}
         />
       </Card>
     </div>

src/components/pages/closing/ClosingsTable.tsx

@@ -126,6 +126,28 @@ const ClosingsTable = () => {
       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',

src/components/pages/closing/sale/SalesReportTable.tsx

@@ -215,31 +215,31 @@ const SalesReportTable = ({
           return kandang?.name || '-';
         },
       },
-      // {
-      //   id: 'payment_status',
-      //   accessorKey: 'payment_status',
-      //   header: 'Status Pembayaran',
-      //   cell: (props) => {
-      //     const status = props.getValue() as string;
-      //     const getStatusColor = (status: string) => {
-      //       if (!status) return 'neutral';
-      //       switch (status.toLowerCase()) {
-      //         case 'paid':
-      //           return 'success';
-      //         case 'tempo':
-      //           return 'warning';
-      //         default:
-      //           return 'neutral';
-      //       }
-      //     };
+      {
+        id: 'payment_status',
+        accessorKey: 'payment_status',
+        header: 'Status Pembayaran',
+        cell: (props) => {
+          const status = props.getValue() as string;
+          const getStatusColor = (status: string) => {
+            if (!status) return 'neutral';
+            switch (status.toLowerCase()) {
+              case 'paid':
+                return 'success';
+              case 'tempo':
+                return 'warning';
+              default:
+                return 'neutral';
+            }
+          };
 
-      //     return (
-      //       <Badge variant='soft' size='sm' color={getStatusColor(status)}>
-      //         {status || '-'}
-      //       </Badge>
-      //     );
-      //   },
-      // },
+          return (
+            <Badge variant='soft' size='sm' color={getStatusColor(status)}>
+              {status || '-'}
+            </Badge>
+          );
+        },
+      },
     ],
     []
   );

src/components/pages/dashboard/DashboardProduction.tsx

@@ -1,491 +0,0 @@
-'use client';
-
-import Button from '@/components/Button';
-import { Icon } from '@iconify/react';
-import Modal, { useModal } from '@/components/Modal';
-import DateInput from '@/components/input/DateInput';
-import SelectInput, {
-  OptionType,
-  useSelect,
-} from '@/components/input/SelectInput';
-import { useState } from 'react';
-import useSWR from 'swr';
-import { DashboardApi } from '@/services/api/dashboard';
-import { useFormik } from 'formik';
-import { ProjectFlockApi } from '@/services/api/production';
-import { KandangApi, LocationApi } from '@/services/api/master-data';
-
-import {
-  DashboardFilterType,
-  getDashboardFilterSchema,
-} from '@/components/pages/dashboard/filter/DashboardProductionFilter.schema';
-import DashboardLineChart from '@/components/pages/dashboard/chart/DashboardLineChart';
-import DashboardLineChartSkeleton from '@/components/pages/dashboard/skeleton/DashboardLineChartSkeleton';
-import { RadioGroup, RadioGroupItem } from '@/components/input/RadioInput';
-import {
-  DashboardFilter,
-  DashboardMeta,
-} from '@/types/api/dashboard/dashboard';
-import DashboardStats from '@/components/pages/dashboard/chart/DashboardStats';
-import { isResponseSuccess } from '@/lib/api-helper';
-import AlertErrorList from '@/components/helper/form/FormErrors';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
-
-// Helper function to normalize values to array
-const normalizeToArray = (
-  value: OptionType | OptionType[] | null | undefined
-): number[] => {
-  if (!value) return [];
-  if (Array.isArray(value)) {
-    return value.map((v) => Number(v.value));
-  }
-  return [Number(value.value)];
-};
-
-const DashboardProduction = () => {
-  const filterModal = useModal();
-  const [analysisMode, setAnalysisMode] = useState<'OVERVIEW' | 'COMPARISON'>(
-    'OVERVIEW'
-  );
-  const [endpointUrl, setEndpointUrl] = useState('/dashboards');
-  const [selectedLocationIds, setSelectedLocationIds] = useState<number[]>([]);
-
-  // ===== FETCH DATA =====
-  const {
-    data: dashboardProductionResponse,
-    isLoading: isLoadingDashboardProductionData,
-    mutate: refreshDashboardProductionData,
-  } = useSWR(endpointUrl, () =>
-    DashboardApi.getDashboardProductionFetcher(endpointUrl)
-  );
-
-  const dashboardProductionData = isResponseSuccess(dashboardProductionResponse)
-    ? dashboardProductionResponse.data
-    : undefined;
-
-  // ===== SELECT =====
-  const { options: flockOptions, isLoadingOptions: isLoadingFlockOptions } =
-    useSelect(ProjectFlockApi.basePath, 'id', 'flock_name', '', {
-      limit: 'limit',
-      location_id: selectedLocationIds ? selectedLocationIds.toString() : '',
-    });
-  const {
-    options: locationOptions,
-    isLoadingOptions: isLoadingLocationOptions,
-  } = useSelect(LocationApi.basePath, 'id', 'name', '', {
-    limit: 'limit',
-  });
-  const { options: kandangOptions, isLoadingOptions: isLoadingKandangOptions } =
-    useSelect(KandangApi.basePath, 'id', 'name', '', {
-      limit: 'limit',
-      location_id: selectedLocationIds ? selectedLocationIds.toString() : '',
-    });
-  const comparisonTypeOptions = [
-    { value: 'FARM', label: 'Farm' },
-    { value: 'FLOCK', label: 'Flock' },
-    { value: 'KANDANG', label: 'Kandang' },
-  ];
-
-  // ===== FORMIK =====
-  const formik = useFormik({
-    initialValues: {
-      startDate: '',
-      endDate: '',
-      flock: [] as OptionType[],
-      location: [] as OptionType[],
-      kandang: [] as OptionType[],
-      analysisMode: analysisMode,
-      comparisonType: '',
-      lokasiIds: [],
-      flockIds: [],
-      kandangIds: [],
-    } as DashboardFilterType,
-    validationSchema: getDashboardFilterSchema(analysisMode),
-    onSubmit: (values) => {
-      console.log(values);
-
-      handleApplyFilter({
-        start_date: values.startDate || '',
-        end_date: values.endDate || '',
-        analysis_mode: values.analysisMode as 'OVERVIEW' | 'COMPARISON',
-        location_ids: normalizeToArray(values.location),
-        flock_ids: normalizeToArray(values.flock),
-        kandang_ids: normalizeToArray(values.kandang),
-        comparison_type: values.comparisonType,
-      });
-    },
-  });
-
-  const handleResetFilter = () => {
-    formik.resetForm();
-    setAnalysisMode('OVERVIEW');
-    setEndpointUrl('/dashboards');
-  };
-
-  const handleApplyFilter = (values: DashboardFilter) => {
-    console.log(values);
-
-    // Build query params object, only include non-empty values
-    const params: Record<string, string> = {};
-
-    if (values.start_date) params.start_date = values.start_date;
-    if (values.end_date) params.end_date = values.end_date;
-    if (values.analysis_mode) params.analysis_mode = values.analysis_mode;
-    if (values.location_ids.length > 0)
-      params.location_ids = values.location_ids.toString();
-    if (values.flock_ids.length > 0)
-      params.flock_ids = values.flock_ids.toString();
-    if (values.kandang_ids.length > 0)
-      params.kandang_ids = values.kandang_ids.toString();
-    if (values.comparison_type) params.comparison_type = values.comparison_type;
-
-    setEndpointUrl(`/dashboards?${new URLSearchParams(params).toString()}`);
-    console.log(endpointUrl);
-    filterModal.closeModal();
-    refreshDashboardProductionData();
-    formik.resetForm();
-  };
-
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
-  if (isLoadingDashboardProductionData) {
-    return (
-      <div className='w-full min-h-screen flex items-center justify-center'>
-        <span className='loading loading-spinner loading-xl'></span>
-      </div>
-    );
-  }
-  return (
-    <>
-      <section className='w-full p-4 space-y-6'>
-        <div className='flex flex-col sm:flex-row items-center justify-between gap-4'>
-          <div></div>
-          <div className='flex flex-row justify-end gap-2'>
-            <Button
-              variant='outline'
-              className={`min-w-28 rounded-lg ${
-                isResponseSuccess(dashboardProductionResponse) &&
-                (dashboardProductionResponse.meta as unknown as DashboardMeta)
-                  .filters
-                  ? 'bg-gradient-to-r from-blue-50 to-blue-100 border-blue-500 text-blue-600 hover:from-blue-100 hover:to-blue-200'
-                  : ''
-              }`}
-              onClick={() => filterModal.openModal()}
-            >
-              <Icon
-                icon='heroicons:funnel'
-                width={20}
-                height={20}
-                className={
-                  isResponseSuccess(dashboardProductionResponse) &&
-                  (dashboardProductionResponse.meta as unknown as DashboardMeta)
-                    .filters
-                    ? 'text-blue-600'
-                    : ''
-                }
-              />
-              Filter
-              {isResponseSuccess(dashboardProductionResponse) &&
-                dashboardProductionResponse.meta &&
-                (dashboardProductionResponse.meta as unknown as DashboardMeta)
-                  .filters && (
-                  <span className='w-6 h-6 text-white bg-red-500 rounded-lg flex items-center justify-center text-xs'>
-                    {(() => {
-                      const meta =
-                        dashboardProductionResponse.meta as unknown as DashboardMeta;
-                      if (!meta.filters) return 0;
-                      const count =
-                        (meta.filters.location_ids.length > 1
-                          ? meta.filters.location_ids.length
-                          : 0) +
-                        (meta.filters.flock_ids.length > 1
-                          ? meta.filters.flock_ids.length
-                          : 0) +
-                        (meta.filters.kandang_ids.length > 1
-                          ? meta.filters.kandang_ids.length
-                          : 0);
-                      return meta.filters.analysis_mode === 'OVERVIEW'
-                        ? 1
-                        : count;
-                    })()}
-                  </span>
-                )}
-            </Button>
-            <Button
-              variant='outline'
-              color='neutral'
-              className='min-w-28 rounded-lg'
-            >
-              <Icon icon='heroicons:arrow-down-tray' width={20} height={20} />
-              Export
-              <Icon icon='heroicons:chevron-down' width={20} height={20} />
-            </Button>
-          </div>
-        </div>
-
-        {/* Dashboard Stats */}
-        <DashboardStats data={dashboardProductionData?.statistics_data ?? []} />
-
-        {/* Use DashboardLineChart component or skeleton */}
-        {isLoadingDashboardProductionData ? (
-          <DashboardLineChartSkeleton />
-        ) : dashboardProductionData &&
-          dashboardProductionData.charts &&
-          Object.keys(dashboardProductionData.charts).length > 0 ? (
-          <DashboardLineChart
-            analysisMode={
-              isResponseSuccess(dashboardProductionResponse)
-                ? dashboardProductionResponse.meta
-                  ? (
-                      dashboardProductionResponse.meta as unknown as DashboardMeta
-                    ).filters?.analysis_mode
-                  : analysisMode
-                : analysisMode
-            }
-            data={dashboardProductionData}
-          />
-        ) : (
-          <DashboardLineChartSkeleton
-            meta={
-              isResponseSuccess(dashboardProductionResponse)
-                ? (dashboardProductionResponse.meta as unknown as DashboardMeta)
-                : undefined
-            }
-          />
-        )}
-      </section>
-
-      <Modal
-        ref={filterModal.ref}
-        className={{
-          modal: 'p-0',
-          modalBox: 'p-0 rounded-xl',
-        }}
-      >
-        <div className='space-y-6'>
-          {/* Modal Header */}
-          <div className='flex items-center justify-between gap-2 py-3 border-b border-gray-300'>
-            <div className='flex items-center gap-2 ms-4'>
-              <Icon icon='heroicons:funnel' width={20} height={20} />
-              <h3 className='font-semibold'>Filter Data</h3>
-            </div>
-            <Button
-              variant='link'
-              onClick={() => filterModal.closeModal()}
-              className='text-gray-500 hover:text-gray-700 me-4 '
-            >
-              <Icon icon='heroicons:x-mark' width={20} height={20} />
-            </Button>
-          </div>
-
-          <form
-            className='space-y-4'
-            onSubmit={handleFormSubmit}
-            onReset={handleResetFilter}
-          >
-            {/* Rentang Waktu */}
-            <div className='px-4'>
-              <label className='flex items-center gap-2 mb-3'>Tanggal</label>
-              <div className='flex items-center gap-2'>
-                <DateInput
-                  name='startDate'
-                  placeholder='Tanggal Mulai'
-                  value={formik.values.startDate}
-                  errorMessage={formik.errors.startDate}
-                  onChange={formik.handleChange}
-                  className={{
-                    inputWrapper: 'rounded-lg',
-                  }}
-                  isError={
-                    Boolean(formik.errors.startDate) &&
-                    Boolean(formik.touched.startDate)
-                  }
-                />
-                <span className='hidden md:block text-center'>—</span>
-                <DateInput
-                  name='endDate'
-                  placeholder='Tanggal Akhir'
-                  value={formik.values.endDate}
-                  errorMessage={formik.errors.endDate}
-                  onChange={formik.handleChange}
-                  className={{
-                    inputWrapper: 'rounded-lg',
-                  }}
-                  isError={
-                    Boolean(formik.errors.endDate) &&
-                    Boolean(formik.touched.endDate)
-                  }
-                />
-              </div>
-            </div>
-
-            {/* Analysis Mode */}
-            <div className='px-4'>
-              <label className='block mb-3'>Analysis Mode</label>
-              <RadioGroup
-                name='analysisMode'
-                value={formik.values.analysisMode}
-                onChange={(e) => {
-                  formik.handleChange(e);
-                  setAnalysisMode(e.target.value as 'OVERVIEW' | 'COMPARISON');
-                  // Reset all dependent fields when analysis mode changes
-                  formik.setFieldValue('location', []);
-                  formik.setFieldValue('flock', []);
-                  formik.setFieldValue('kandang', []);
-                  formik.setFieldValue('comparisonType', '');
-                  setSelectedLocationIds([]);
-                }}
-                color='primary'
-                className={{
-                  wrapper: 'w-full my-6 font-semibold text-neutral-500',
-                }}
-              >
-                <RadioGroupItem
-                  color='primary'
-                  value='OVERVIEW'
-                  label='Performance Overview'
-                />
-                <RadioGroupItem
-                  color='primary'
-                  value='COMPARISON'
-                  label='Performance Comparison'
-                />
-              </RadioGroup>
-            </div>
-
-            {formik.values.analysisMode === 'COMPARISON' && (
-              <div className='px-4'>
-                <SelectInput
-                  label='Compared By'
-                  value={comparisonTypeOptions.find(
-                    (option) => option.value === formik.values.comparisonType
-                  )}
-                  onChange={(selected) =>
-                    formik.setFieldValue(
-                      'comparisonType',
-                      selected ? (selected as OptionType).value : ''
-                    )
-                  }
-                  errorMessage={formik.errors.comparisonType as string}
-                  options={comparisonTypeOptions}
-                  isLoading={isLoadingLocationOptions}
-                  isError={
-                    Boolean(formik.errors.comparisonType) &&
-                    Boolean(formik.touched.comparisonType)
-                  }
-                />
-              </div>
-            )}
-
-            {/* Location */}
-            <div className='px-4'>
-              <SelectInput
-                label='Farm'
-                value={formik.values.location}
-                onChange={(selected) => {
-                  formik.setFieldValue('location', selected);
-                  // Update selectedLocationIds for kandang filter
-                  setSelectedLocationIds(normalizeToArray(selected));
-                  // Reset dependent fields when location changes
-                  formik.setFieldValue('flock', []);
-                  formik.setFieldValue('kandang', []);
-                }}
-                errorMessage={formik.errors.location as string}
-                options={locationOptions}
-                isLoading={isLoadingLocationOptions}
-                isMulti={
-                  comparisonTypeOptions.find(
-                    (option) => option.value === formik.values.comparisonType
-                  )?.value === 'FARM'
-                }
-                isError={
-                  Boolean(formik.errors.location) &&
-                  Boolean(formik.touched.location)
-                }
-              />
-            </div>
-
-            {/* Flock */}
-            {!(
-              formik.values.analysisMode === 'COMPARISON' &&
-              !(
-                formik.values.comparisonType === 'FLOCK' ||
-                formik.values.comparisonType === 'KANDANG'
-              )
-            ) && (
-              <div className='px-4'>
-                <SelectInput
-                  label='Flock'
-                  value={formik.values.flock}
-                  onChange={(selected) =>
-                    formik.setFieldValue('flock', selected)
-                  }
-                  errorMessage={formik.errors.flock as string}
-                  options={flockOptions}
-                  isLoading={isLoadingFlockOptions}
-                  isMulti={
-                    comparisonTypeOptions.find(
-                      (option) => option.value === formik.values.comparisonType
-                    )?.value === 'FLOCK'
-                  }
-                  isError={
-                    Boolean(formik.errors.flock) &&
-                    Boolean(formik.touched.flock)
-                  }
-                />
-              </div>
-            )}
-
-            {/* Kandang */}
-            {!(
-              formik.values.analysisMode === 'COMPARISON' &&
-              !(formik.values.comparisonType === 'KANDANG')
-            ) && (
-              <div className='px-4'>
-                <SelectInput
-                  label='Kandang'
-                  value={formik.values.kandang}
-                  onChange={(selected) =>
-                    formik.setFieldValue('kandang', selected)
-                  }
-                  errorMessage={formik.errors.kandang as string}
-                  options={kandangOptions}
-                  isLoading={isLoadingKandangOptions}
-                  isMulti={
-                    comparisonTypeOptions.find(
-                      (option) => option.value === formik.values.comparisonType
-                    )?.value === 'KANDANG'
-                  }
-                  isError={
-                    Boolean(formik.errors.kandang) &&
-                    Boolean(formik.touched.kandang)
-                  }
-                />
-              </div>
-            )}
-
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
-            {/* Action Buttons */}
-            <div className='flex justify-between gap-4 py-4 mt-8 border-t border-gray-300 bg-gray-100'>
-              <Button
-                type='reset'
-                variant='soft'
-                className='ms-4 min-w-36 rounded-lg'
-                onClick={handleResetFilter}
-              >
-                Reset Filter
-              </Button>
-              <Button type='submit' className='me-4 min-w-36 rounded-lg'>
-                Terapkan Filter
-              </Button>
-            </div>
-          </form>
-        </div>
-      </Modal>
-    </>
-  );
-};
-
-export default DashboardProduction;

src/components/pages/dashboard/chart/DashboardLineChart.tsx

@@ -1,545 +0,0 @@
-import Button from '@/components/Button';
-import Card from '@/components/Card';
-import Dropdown from '@/components/Dropdown';
-import Menu from '@/components/menu/Menu';
-import MenuItem from '@/components/menu/MenuItem';
-import {
-  Dashboard,
-  DashboardOverviewCharts,
-  DashboardComparisonCharts,
-  DashboardChartsSeries,
-  DashboardChartsDataset,
-} from '@/types/api/dashboard/dashboard';
-import { Icon } from '@iconify/react';
-import { useState, useEffect } from 'react';
-import {
-  CartesianGrid,
-  Line,
-  LineChart,
-  ResponsiveContainer,
-  Tooltip,
-  XAxis,
-  YAxis,
-} from 'recharts';
-
-type DashboardLineChartProps = {
-  analysisMode: 'OVERVIEW' | 'COMPARISON';
-  data: Dashboard;
-};
-
-// Type guard to check if charts is DashboardOverviewCharts
-function isOverviewCharts(
-  charts: DashboardOverviewCharts | DashboardComparisonCharts
-): charts is DashboardOverviewCharts {
-  return 'deplesi' in charts;
-}
-
-// Type guard to check if charts is DashboardComparisonCharts
-function isComparisonCharts(
-  charts: DashboardOverviewCharts | DashboardComparisonCharts
-): charts is DashboardComparisonCharts {
-  return 'location' in charts || 'flock' in charts || 'kandang' in charts;
-}
-
-const lineColors: Record<string, string> = {
-  body_weight: '#10B981',
-  std_body_weight: '#10B981',
-  act_laying: '#1062B9',
-  std_laying: '#1062B9',
-  act_egg_weight: '#10B981',
-  std_egg_weight: '#10B981',
-  act_feed_intake: '#F52419',
-  std_feed_intake: '#F52419',
-  act_uniformity: '#F59E0B',
-  std_uniformity: '#F59E0B',
-  act_fcr: '#10B981',
-  std_fcr: '#10B981',
-  act_fcr_cum: '#F52419',
-  std_fcr_cum: '#10B981',
-  normal: '#10B981',
-  abnormal: '#F52419',
-  act_deplesi: '#10B981',
-  std_deplesi: '#10B981',
-};
-
-const defaultLineColors: string[] = [
-  '#10B981',
-  '#1062B9',
-  '#F52419',
-  '#F59E0B',
-  '#7F56D9',
-];
-
-// Helper function to get line color
-const getLineColor = (
-  seriesId: string | number,
-  index: number,
-  mode: 'OVERVIEW' | 'COMPARISON'
-): string => {
-  // For COMPARISON mode, use default colors with cycling
-  if (mode === 'COMPARISON') {
-    return defaultLineColors[index % defaultLineColors.length];
-  }
-
-  // For OVERVIEW mode, use predefined colors or fallback to default
-  const predefinedColor = lineColors[seriesId];
-  if (predefinedColor) {
-    return predefinedColor;
-  }
-
-  // Fallback to default colors with cycling
-  return defaultLineColors[index % defaultLineColors.length];
-};
-
-const DashboardLineChart = ({
-  analysisMode,
-  data,
-}: DashboardLineChartProps) => {
-  const [chartData, setChartData] =
-    useState<keyof DashboardOverviewCharts>('body_weight');
-  const [open, setOpen] = useState(false);
-  // Track which series are visible (by series id)
-  const [visibleSeries, setVisibleSeries] = useState<Set<string | number>>(
-    new Set()
-  );
-
-  // Mapping for chart type labels
-  const chartTypeLabels: Record<keyof DashboardOverviewCharts, string> = {
-    body_weight: 'Body Weight',
-    performance: 'Performance',
-    fcr: 'FCR',
-    quality_control: 'Quality Control',
-    deplesi: 'Deplesi',
-  };
-
-  // Initialize all series as visible when chartData changes
-  useEffect(() => {
-    let seriesData: DashboardChartsSeries[] = [];
-
-    if (analysisMode === 'OVERVIEW' && isOverviewCharts(data.charts)) {
-      seriesData = data.charts[chartData]?.series || [];
-    } else if (
-      analysisMode === 'COMPARISON' &&
-      isComparisonCharts(data.charts)
-    ) {
-      const comparisonChart =
-        data.charts.location || data.charts.flock || data.charts.kandang;
-      seriesData = comparisonChart?.series || [];
-    }
-
-    // Set all series as visible by default
-    const allSeriesIds = new Set(seriesData.map((s) => s.id));
-    setVisibleSeries(allSeriesIds);
-  }, [chartData, analysisMode, data.charts]);
-
-  return (
-    <Card
-      className={{
-        wrapper: 'w-full rounded-lg',
-      }}
-      variant='bordered'
-    >
-      <div className='flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4 mb-6'>
-        <div className='text-lg font-semibold'>
-          Performance{' '}
-          <Icon
-            icon='heroicons:information-circle'
-            width={20}
-            height={20}
-            className='inline text-neutral-500'
-          />
-        </div>
-        {analysisMode == 'OVERVIEW' && (
-          <Dropdown
-            align='end'
-            direction='bottom'
-            trigger={
-              <Button
-                variant='outline'
-                color='none'
-                className='text-neutral-500 hover:text-neutral-700 rounded-lg px-4 py-2 border-neutral-300'
-                onClick={() => setOpen(!open)}
-              >
-                {chartTypeLabels[chartData]}{' '}
-                <div className='divider divider-horizontal p-0 m-0 before:bg-neutral-300 after:bg-neutral-300'></div>
-                <Icon icon='heroicons:chevron-down' width={20} height={20} />
-              </Button>
-            }
-            className={{
-              content: 'w-52 mt-3',
-            }}
-            controlled={open}
-          >
-            <Menu>
-              <MenuItem
-                title='Body weight'
-                onClick={() => {
-                  setChartData('body_weight');
-                  setOpen(!open);
-                }}
-              />
-              <MenuItem
-                title='Performance'
-                onClick={() => {
-                  setChartData('performance');
-                  setOpen(!open);
-                }}
-              />
-              <MenuItem
-                title='FCR'
-                onClick={() => {
-                  setChartData('fcr');
-                  setOpen(!open);
-                }}
-              />
-              <MenuItem
-                title='Quality Control'
-                onClick={() => {
-                  setChartData('quality_control');
-                  setOpen(!open);
-                }}
-              />
-              <MenuItem
-                title='Deplesi'
-                onClick={() => {
-                  setChartData('deplesi');
-                  setOpen(!open);
-                }}
-              />
-            </Menu>
-          </Dropdown>
-        )}
-      </div>
-
-      {/* Legend - Dynamic based on series data */}
-      <div className='flex flex-wrap gap-3 mb-6'>
-        {(() => {
-          // Get series data based on current mode and chartData
-          let seriesData: DashboardChartsSeries[] = [];
-
-          if (analysisMode === 'OVERVIEW' && isOverviewCharts(data.charts)) {
-            seriesData = data.charts[chartData]?.series || [];
-          } else if (
-            analysisMode === 'COMPARISON' &&
-            isComparisonCharts(data.charts)
-          ) {
-            const comparisonChart =
-              data.charts.location || data.charts.flock || data.charts.kandang;
-            seriesData = comparisonChart?.series || [];
-          }
-
-          return seriesData.map((series, index) => {
-            const isVisible = visibleSeries.has(series.id);
-            const isStandard = series.id
-              .toString()
-              .toLowerCase()
-              .includes('std');
-
-            return (
-              <button
-                key={series.id}
-                onClick={() => {
-                  const newVisible = new Set(visibleSeries);
-                  if (isVisible) {
-                    newVisible.delete(series.id);
-                  } else {
-                    newVisible.add(series.id);
-                  }
-                  setVisibleSeries(newVisible);
-                }}
-                className={`flex items-center gap-2 px-3 py-2 rounded-lg border transition-colors ${
-                  isVisible
-                    ? 'border-neutral-400 bg-neutral-50'
-                    : 'border-neutral-300 hover:bg-neutral-50'
-                }`}
-              >
-                <div
-                  className={`w-6 h-0.5 ${
-                    isStandard ? 'border-t-2 border-dashed' : ''
-                  } ${!isVisible ? 'opacity-30' : ''}`}
-                  style={{
-                    backgroundColor: isStandard
-                      ? 'transparent'
-                      : getLineColor(series.id, index, analysisMode),
-                    borderColor: isStandard
-                      ? getLineColor(series.id, index, analysisMode)
-                      : 'transparent',
-                  }}
-                ></div>
-                <span
-                  className={`text-sm ${isVisible ? 'text-neutral-900 font-medium' : 'text-neutral-700'}`}
-                >
-                  {series.label}
-                </span>
-                <Icon
-                  icon='heroicons:information-circle'
-                  width={16}
-                  height={16}
-                  className='text-neutral-400'
-                />
-              </button>
-            );
-          });
-        })()}
-      </div>
-
-      {/* Chart */}
-      <ResponsiveContainer width='100%' height={350}>
-        <LineChart
-          data={(() => {
-            // Transform data based on analysisMode
-            if (analysisMode === 'OVERVIEW') {
-              // For OVERVIEW mode, use the selected chart data
-              if (isOverviewCharts(data.charts)) {
-                const selectedChartData = data.charts[chartData];
-                if (!selectedChartData || !selectedChartData.dataset) return [];
-                return selectedChartData.dataset;
-              }
-              return [];
-            } else {
-              // For COMPARISON mode, use the first available comparison chart
-              if (isComparisonCharts(data.charts)) {
-                const chartData =
-                  data.charts.location ||
-                  data.charts.flock ||
-                  data.charts.kandang;
-
-                if (!chartData || !chartData.dataset) return [];
-                return chartData.dataset;
-              }
-              return [];
-            }
-          })()}
-          margin={{
-            top: 5,
-            right: 10,
-            left: 0,
-            bottom: 5,
-          }}
-        >
-          <CartesianGrid strokeDasharray='3 3' stroke='#e5e7eb' />
-          <XAxis
-            dataKey='week'
-            tick={{ fontSize: 11, fill: '#9ca3af' }}
-            tickLine={false}
-            axisLine={{ stroke: '#e5e7eb' }}
-            label={{
-              value: 'Weeks',
-              position: 'insideBottom',
-              offset: -5,
-              style: { fontSize: 12, fill: '#9ca3af' },
-            }}
-          />
-          <YAxis
-            tick={{ fontSize: 11, fill: '#9ca3af' }}
-            tickLine={false}
-            axisLine={{ stroke: '#e5e7eb' }}
-            domain={(() => {
-              // Calculate dynamic domain based on visible data
-              let seriesData: DashboardChartsSeries[] = [];
-              let dataset: DashboardChartsDataset[] = [];
-
-              if (
-                analysisMode === 'OVERVIEW' &&
-                isOverviewCharts(data.charts)
-              ) {
-                seriesData = data.charts[chartData]?.series || [];
-                dataset = data.charts[chartData]?.dataset || [];
-              } else if (
-                analysisMode === 'COMPARISON' &&
-                isComparisonCharts(data.charts)
-              ) {
-                const comparisonChart =
-                  data.charts.location ||
-                  data.charts.flock ||
-                  data.charts.kandang;
-                seriesData = comparisonChart?.series || [];
-                dataset = comparisonChart?.dataset || [];
-              }
-
-              // Get all values from visible series
-              const visibleSeriesIds = Array.from(visibleSeries);
-              const allValues: number[] = [];
-
-              dataset.forEach((item: DashboardChartsDataset) => {
-                visibleSeriesIds.forEach((seriesId) => {
-                  const value = item[seriesId];
-                  if (typeof value === 'number') {
-                    allValues.push(value);
-                  }
-                });
-              });
-
-              if (allValues.length === 0) return [0, 100];
-
-              const minValue = Math.min(...allValues);
-              const maxValue = Math.max(...allValues);
-
-              // Add padding (10% on each side)
-              const padding = (maxValue - minValue) * 0.1;
-              const domainMin = Math.floor(Math.max(0, minValue - padding));
-              const domainMax = Math.ceil(maxValue + padding);
-
-              return [domainMin, domainMax];
-            })()}
-            ticks={(() => {
-              // Calculate dynamic ticks based on domain
-              let seriesData: DashboardChartsSeries[] = [];
-              let dataset: DashboardChartsDataset[] = [];
-
-              if (
-                analysisMode === 'OVERVIEW' &&
-                isOverviewCharts(data.charts)
-              ) {
-                seriesData = data.charts[chartData]?.series || [];
-                dataset = data.charts[chartData]?.dataset || [];
-              } else if (
-                analysisMode === 'COMPARISON' &&
-                isComparisonCharts(data.charts)
-              ) {
-                const comparisonChart =
-                  data.charts.location ||
-                  data.charts.flock ||
-                  data.charts.kandang;
-                seriesData = comparisonChart?.series || [];
-                dataset = comparisonChart?.dataset || [];
-              }
-
-              const visibleSeriesIds = Array.from(visibleSeries);
-              const allValues: number[] = [];
-
-              dataset.forEach((item: DashboardChartsDataset) => {
-                visibleSeriesIds.forEach((seriesId) => {
-                  const value = item[seriesId];
-                  if (typeof value === 'number') {
-                    allValues.push(value);
-                  }
-                });
-              });
-
-              if (allValues.length === 0) return [0, 25, 50, 75, 100];
-
-              const minValue = Math.min(...allValues);
-              const maxValue = Math.max(...allValues);
-              const padding = (maxValue - minValue) * 0.1;
-              const domainMin = Math.floor(Math.max(0, minValue - padding));
-              const domainMax = Math.ceil(maxValue + padding);
-
-              // Generate 5 evenly spaced ticks
-              const range = domainMax - domainMin;
-              const step = range / 4;
-
-              return [
-                domainMin,
-                Math.round(domainMin + step),
-                Math.round(domainMin + step * 2),
-                Math.round(domainMin + step * 3),
-                domainMax,
-              ];
-            })()}
-          />
-          <Tooltip
-            contentStyle={{
-              backgroundColor: '#1f2937',
-              border: 'none',
-              borderRadius: '8px',
-              padding: '8px 12px',
-              color: 'white',
-            }}
-            labelStyle={{ color: 'white', marginBottom: '4px' }}
-            itemStyle={{ color: 'white', fontSize: '12px' }}
-            labelFormatter={(value) => `Week ${value}`}
-            formatter={(
-              value: number | undefined,
-              name: string | undefined
-            ) => {
-              if (value === undefined || name === undefined) return ['', ''];
-
-              // Get series data to find the unit
-              let seriesData: DashboardChartsSeries[] = [];
-              if (
-                analysisMode === 'OVERVIEW' &&
-                isOverviewCharts(data.charts)
-              ) {
-                seriesData = data.charts[chartData]?.series || [];
-              } else if (
-                analysisMode === 'COMPARISON' &&
-                isComparisonCharts(data.charts)
-              ) {
-                const comparisonChart =
-                  data.charts.location ||
-                  data.charts.flock ||
-                  data.charts.kandang;
-                seriesData = comparisonChart?.series || [];
-              }
-
-              // Find the series that matches this line's name
-              const series = seriesData.find((s) => s.label === name);
-              const unit = series?.unit || '';
-
-              return [`${value} ${unit}`, name];
-            }}
-          />
-          {/* Dynamic Line rendering based on visible series */}
-          {(() => {
-            let seriesData: DashboardChartsSeries[] = [];
-
-            if (analysisMode === 'OVERVIEW' && isOverviewCharts(data.charts)) {
-              seriesData = data.charts[chartData]?.series || [];
-            } else if (
-              analysisMode === 'COMPARISON' &&
-              isComparisonCharts(data.charts)
-            ) {
-              const comparisonChart =
-                data.charts.location ||
-                data.charts.flock ||
-                data.charts.kandang;
-              seriesData = comparisonChart?.series || [];
-            }
-
-            return seriesData
-              .filter((series) => visibleSeries.has(series.id))
-              .map((series, index) => {
-                const isStandard = series.id
-                  .toString()
-                  .toLowerCase()
-                  .includes('std');
-                // Use series.id directly as dataKey to match dataset fields
-                const dataKey = series.id.toString();
-
-                return (
-                  <Line
-                    key={series.id}
-                    type='monotone'
-                    dataKey={dataKey}
-                    name={series.label}
-                    stroke={getLineColor(series.id, index, analysisMode)}
-                    opacity={isStandard ? 0.5 : 1}
-                    strokeWidth={2}
-                    strokeDasharray={isStandard ? '5 5' : undefined}
-                    dot={
-                      isStandard
-                        ? false
-                        : {
-                            r: 3,
-                            fill: '#fff',
-                            stroke: getLineColor(
-                              series.id,
-                              index,
-                              analysisMode
-                            ),
-                            strokeWidth: 2,
-                          }
-                    }
-                    activeDot={isStandard ? undefined : { r: 5 }}
-                  />
-                );
-              });
-          })()}
-        </LineChart>
-      </ResponsiveContainer>
-    </Card>
-  );
-};
-
-export default DashboardLineChart;

src/components/pages/dashboard/chart/DashboardStats.tsx

@@ -1,166 +0,0 @@
-import Alert from '@/components/Alert';
-import Card from '@/components/Card';
-import { formatNumber } from '@/lib/helper';
-import { DashboardStatisticsData } from '@/types/api/dashboard/dashboard';
-import { Icon } from '@iconify/react';
-
-interface DashboardStatsProps {
-  data: DashboardStatisticsData[];
-}
-
-// Konfigurasi untuk setiap kartu
-const CARD_CONFIG = [
-  {
-    key: 'HPP Global',
-    icon: 'heroicons:banknotes',
-    alertColor: 'warning' as const,
-    suffix: ' /Kg',
-    prefix: 'RP ',
-  },
-  {
-    key: 'Avg. Selling Price',
-    icon: 'heroicons:document-currency-dollar',
-    alertColor: 'success' as const,
-    suffix: ' /Kg',
-    prefix: '',
-  },
-  {
-    key: 'FCR',
-    icon: 'heroicons:clipboard-document-list',
-    alertColor: 'info' as const,
-    suffix: '',
-    prefix: '',
-  },
-  {
-    key: 'Mortality',
-    icon: 'heroicons:exclamation-triangle',
-    alertColor: 'error' as const,
-    suffix: ' %',
-    prefix: '',
-  },
-];
-
-const DashboardStats = ({ data }: DashboardStatsProps) => {
-  // Helper to get trend icon and color
-  const getTrendDisplay = (percent: number) => {
-    const isPositive = percent >= 0;
-    return {
-      icon: isPositive
-        ? 'heroicons:arrow-trending-up'
-        : 'heroicons:arrow-trending-down',
-      color: isPositive ? 'text-success' : 'text-error',
-      value: Math.abs(percent),
-    };
-  };
-
-  // Helper to format value
-  const formatValue = (value: number, prefix: string, suffix: string) => {
-    return (
-      <>
-        {prefix}
-        {formatNumber(value)}
-        {suffix && (
-          <span className='text-sm font-normal text-neutral-500'>{suffix}</span>
-        )}
-      </>
-    );
-  };
-
-  return (
-    <div className='grid sm:grid-cols-2 xl:grid-cols-4 gap-6'>
-      {CARD_CONFIG.map((config) => {
-        // Find matching data from API
-        const cardData = data.find((item) => item.label === config.key);
-
-        if (!cardData) {
-          // Show placeholder card for missing data (FCR & Mortality)
-          return (
-            <Card
-              key={config.key}
-              className={{
-                wrapper: 'w-full rounded-lg',
-                body: 'p-0',
-              }}
-              variant='bordered'
-              footer={
-                <div className='flex flex-row justify-between px-4 pb-4'>
-                  <div className='text-neutral-400 font-semibold text-sm'>
-                    From last month
-                  </div>
-                  <div className='text-neutral-400 font-semibold text-sm'>
-                    Filter Required
-                  </div>
-                </div>
-              }
-            >
-              <div className='flex flex-row items-center gap-4 px-4 pt-4'>
-                <Alert variant='soft' className='rounded-lg p-3 bg-neutral-100'>
-                  <Icon
-                    icon={config.icon}
-                    width={32}
-                    height={32}
-                    className='text-neutral-400'
-                  />
-                </Alert>
-                <div>
-                  <h3 className='text-neutral-400 font-semibold text-sm'>
-                    {config.key}
-                  </h3>
-                  <p className='text-2xl font-semibold text-neutral-400'>
-                    ********
-                  </p>
-                </div>
-              </div>
-            </Card>
-          );
-        }
-
-        const trend = getTrendDisplay(cardData.percent_last_month);
-
-        return (
-          <Card
-            key={config.key}
-            className={{
-              wrapper: 'w-full rounded-lg',
-              body: 'p-0',
-            }}
-            variant='bordered'
-            footer={
-              <div className='flex flex-row justify-between px-4 pb-4'>
-                <div className='text-neutral-500 font-semibold text-sm'>
-                  From last month
-                </div>
-                <div
-                  className={`${trend.color} font-semibold flex flex-row items-center gap-1 text-sm`}
-                >
-                  <Icon icon={trend.icon} width={16} height={16} />
-                  {trend.value}%
-                </div>
-              </div>
-            }
-          >
-            <div className='flex flex-row items-center gap-4 px-4 pt-4'>
-              <Alert
-                variant='soft'
-                color={config.alertColor}
-                className='rounded-lg p-3'
-              >
-                <Icon icon={config.icon} width={32} height={32} />
-              </Alert>
-              <div>
-                <h3 className='text-neutral-500 font-semibold text-sm'>
-                  {cardData.label}
-                </h3>
-                <p className='text-2xl font-semibold'>
-                  {formatValue(cardData.value, config.prefix, config.suffix)}
-                </p>
-              </div>
-            </div>
-          </Card>
-        );
-      })}
-    </div>
-  );
-};
-
-export default DashboardStats;

src/components/pages/dashboard/filter/DashboardProductionFilter.schema.ts

@@ -1,117 +0,0 @@
-import { OptionType } from '@/components/input/SelectInput';
-import * as yup from 'yup';
-
-export type DashboardFilterType = {
-  startDate: string;
-  endDate: string;
-  analysisMode: string;
-  comparisonType: string | undefined;
-  location: OptionType | OptionType[];
-  lokasiIds: number[] | undefined;
-  flock: OptionType | OptionType[] | undefined;
-  flockIds: number[] | undefined;
-  kandang: OptionType | OptionType[] | undefined;
-  kandangIds: number[] | undefined;
-};
-
-// Schema untuk mode OVERVIEW - semua field required
-export const DashboardFilterOverviewSchema: yup.ObjectSchema<DashboardFilterType> =
-  yup.object({
-    startDate: yup.string().required('Start date is required'),
-    endDate: yup.string().required('End date is required'),
-    analysisMode: yup.string().required('Analysis mode is required'),
-    comparisonType: yup.string().when('analysisMode', {
-      is: 'COMPARISON',
-      then: (schema) => schema.required('Compared by is required'),
-      otherwise: (schema) => schema.optional(),
-    }),
-    lokasiIds: yup.array().optional(),
-    flockIds: yup.array().optional(),
-    kandangIds: yup.array().optional(),
-    location: yup
-      .mixed<OptionType | OptionType[]>()
-      .required('Farm is required')
-      .test('is-not-empty', 'Farm is required', (value) => {
-        if (Array.isArray(value)) {
-          return value.length > 0;
-        }
-        return !!value;
-      }),
-    flock: yup
-      .mixed<OptionType | OptionType[]>()
-      .required('Flock is required')
-      .test('is-not-empty', 'Flock is required', (value) => {
-        if (Array.isArray(value)) {
-          return value.length > 0;
-        }
-        return !!value;
-      }),
-    kandang: yup
-      .mixed<OptionType | OptionType[]>()
-      .required('Kandang is required')
-      .test('is-not-empty', 'Kandang is required', (value) => {
-        if (Array.isArray(value)) {
-          return value.length > 0;
-        }
-        return !!value;
-      }),
-  });
-
-// Schema untuk mode COMPARISON - conditional validation
-export const DashboardFilterComparisonSchema: yup.ObjectSchema<DashboardFilterType> =
-  yup.object({
-    startDate: yup.string().required('Start date is required'),
-    endDate: yup.string().required('End date is required'),
-    analysisMode: yup.string().required('Analysis mode is required'),
-    comparisonType: yup.string().when('analysisMode', {
-      is: 'COMPARISON',
-      then: (schema) => schema.required('Compared by is required'),
-      otherwise: (schema) => schema.optional(),
-    }),
-    lokasiIds: yup.array().optional(),
-    flockIds: yup.array().optional(),
-    kandangIds: yup.array().optional(),
-    location: yup
-      .mixed<OptionType | OptionType[]>()
-      .required('Farm is required')
-      .test('is-not-empty', 'Farm is required', (value) => {
-        if (Array.isArray(value)) {
-          return value.length > 0;
-        }
-        return !!value;
-      }),
-    flock: yup.mixed<OptionType | OptionType[]>().when('comparisonType', {
-      is: (value: string) => value === 'FLOCK' || value === 'KANDANG',
-      then: (schema) =>
-        schema.test('is-required', 'Flock is required', (value) => {
-          if (Array.isArray(value)) {
-            return value.length > 0;
-          }
-          return !!value;
-        }),
-      otherwise: (schema) => schema.optional(),
-    }),
-    kandang: yup.mixed<OptionType | OptionType[]>().when('comparisonType', {
-      is: 'KANDANG',
-      then: (schema) =>
-        schema.test('is-required', 'Kandang is required', (value) => {
-          if (Array.isArray(value)) {
-            return value.length > 0;
-          }
-          return !!value;
-        }),
-      otherwise: (schema) => schema.optional(),
-    }),
-  });
-
-// Helper function untuk mendapatkan schema yang sesuai berdasarkan analysis mode
-export const getDashboardFilterSchema = (analysisMode?: string) => {
-  return analysisMode === 'OVERVIEW'
-    ? DashboardFilterOverviewSchema
-    : DashboardFilterComparisonSchema;
-};
-
-// Default schema
-export const DashboardFilterSchema = DashboardFilterComparisonSchema;
-
-export type DashboardFilterValues = yup.InferType<typeof DashboardFilterSchema>;

src/components/pages/dashboard/skeleton/DashboardLineChartSkeleton.tsx

@@ -1,100 +0,0 @@
-import { Icon } from '@iconify/react';
-import { DashboardMeta } from '@/types/api/dashboard/dashboard';
-
-const DashboardLineChartSkeleton = ({ meta }: { meta?: DashboardMeta }) => {
-  return (
-    <div className='w-full bg-white rounded-lg shadow-sm border border-gray-200 p-6 relative'>
-      {/* Header with title skeleton */}
-      <div className='text-lg font-semibold'>
-        Performance{' '}
-        <Icon
-          icon='heroicons:information-circle'
-          width={20}
-          height={20}
-          className='inline text-neutral-500'
-        />
-      </div>
-
-      {/* Chart area with axes skeleton */}
-      <div className='relative mt-6'>
-        {/* Main chart container */}
-        <div className='flex gap-4'>
-          {/* Y-axis skeleton (left side) */}
-          <div className='flex flex-col justify-between py-4 space-y-4'>
-            {[1, 2, 3, 4, 5, 6].map((item) => (
-              <div
-                key={item}
-                className='h-4 w-12 bg-gray-100 rounded animate-pulse'
-              ></div>
-            ))}
-          </div>
-
-          {/* Chart content area */}
-          <div className='flex-1 relative'>
-            {/* Empty state centered in chart area */}
-            <div className='absolute inset-0 flex flex-col items-center justify-center pb-12'>
-              {!meta?.filters && (
-                <>
-                  {/* Filter icon */}
-                  <div className='w-12 h-12 bg-blue-500 rounded-xl flex items-center justify-center mb-4'>
-                    <Icon
-                      icon='heroicons:funnel'
-                      className='text-white'
-                      width={24}
-                      height={24}
-                    />
-                  </div>
-
-                  {/* Empty state text */}
-                  <h3 className='text-gray-900 font-semibold text-base mb-2'>
-                    No Filters Selected
-                  </h3>
-                  <p className='text-gray-500 text-sm text-center max-w-xs'>
-                    Please choose filters to narrow down your results and make
-                    your search easier.
-                  </p>
-                </>
-              )}
-              {meta?.filters && (
-                <>
-                  {/* Filter icon */}
-                  <div className='w-12 h-12 bg-blue-500 rounded-xl flex items-center justify-center mb-4'>
-                    <Icon
-                      icon='heroicons:chart-bar'
-                      className='text-white'
-                      width={24}
-                      height={24}
-                    />
-                  </div>
-
-                  {/* Empty state text */}
-                  <h3 className='text-gray-900 font-semibold text-base mb-2'>
-                    Data Not Yet Available
-                  </h3>
-                  <p className='text-gray-500 text-sm text-center max-w-xs'>
-                    Please change your filters to get the data.
-                  </p>
-                </>
-              )}
-            </div>
-
-            {/* Placeholder for chart height */}
-            <div className='h-64'></div>
-
-            {/* X-axis skeleton (bottom) */}
-            <div className='flex justify-between pt-4 border-t border-gray-100'>
-              {[1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map((item) => (
-                <div
-                  key={item}
-                  className='h-4 w-8 bg-gray-100 rounded animate-pulse'
-                ></div>
-              ))}
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default DashboardLineChartSkeleton;

src/components/pages/expense/ExpenseDetail.tsx

@@ -28,7 +28,7 @@ const ExpenseDetail: React.FC<ExpenseDetailProps> = ({ initialValues }) => {
 
     if (
       initialValues?.latest_approval &&
-      initialValues?.latest_approval.step_number >= 5 &&
+      initialValues?.latest_approval.step_number >= 4 &&
       initialValues.latest_approval.action !== 'REJECTED'
     ) {
       validTabs.push({

src/components/pages/expense/ExpenseRealizationContent.tsx

@@ -16,7 +16,7 @@ import {
 } from '@/components/pages/expense/form/ExpenseRequestForm.schema';
 import { ExpenseApi } from '@/services/api/expense';
 import { isResponseSuccess } from '@/lib/api-helper';
-import { ACCEPTED_FILE_TYPE, S3_PUBLIC_BASE_URL } from '@/config/constant';
+import { ACCEPTED_FILE_TYPE } from '@/config/constant';
 
 interface ExpenseRealizationContentProps {
   initialValues?: Expense;
@@ -48,13 +48,6 @@ const ExpenseRealizationContent = ({
 
   const realizationDocumentsChangeHandler = (val: File[]) => {
     formik.setFieldTouched('documents', true);
-
-    const invalidFiles = val.filter((file) => file.size > 5 * 1024 * 1024);
-    if (invalidFiles.length > 0) {
-      toast.error('Ukuran dokumen maksimal 5 MB!');
-      return;
-    }
-
     formik.setFieldValue('documents', val);
   };
 
@@ -110,32 +103,24 @@ const ExpenseRealizationContent = ({
                     initialValues?.realization_docs.length > 0 && (
                       <ul className='list-disc'>
                         {initialValues?.realization_docs.map(
-                          (realizationDocument, realizationDocumentIdx) => {
-                            const path = realizationDocument.path.startsWith(
-                              '/'
-                            )
-                              ? realizationDocument.path.slice(1)
-                              : realizationDocument.path;
-                            const documentUrl = `${S3_PUBLIC_BASE_URL}/${path}`;
-                            return (
-                              <li key={realizationDocumentIdx}>
-                                <Link
-                                  href={documentUrl}
-                                  target='_blank'
-                                  rel='noopener noreferrer'
-                                  className='text-blue-500 underline'
-                                >
-                                  {realizationDocument.path}{' '}
-                                  <Icon
-                                    icon='cuida:open-in-new-tab-outline'
-                                    width={12}
-                                    height={12}
-                                    className='inline'
-                                  />
-                                </Link>
-                              </li>
-                            );
-                          }
+                          (realizationDocument, realizationDocumentIdx) => (
+                            <li key={realizationDocumentIdx}>
+                              <Link
+                                href={realizationDocument.path}
+                                target='_blank'
+                                rel='noopener noreferrer'
+                                className='text-blue-500 underline'
+                              >
+                                {realizationDocument.path}{' '}
+                                <Icon
+                                  icon='cuida:open-in-new-tab-outline'
+                                  width={12}
+                                  height={12}
+                                  className='inline'
+                                />
+                              </Link>
+                            </li>
+                          )
                         )}
                       </ul>
                     )}
@@ -226,7 +211,7 @@ const ExpenseRealizationContent = ({
             let expenseGrandTotal = 0;
 
             kandangExpense.pengajuans?.forEach(
-              (item) => (expenseGrandTotal += item.qty * item.price)
+              (item) => (expenseGrandTotal += item.price)
             );
 
             return (
@@ -288,7 +273,7 @@ const ExpenseRealizationContent = ({
             let expenseGrandTotal = 0;
 
             kandangExpense.realisasi?.forEach(
-              (item) => (expenseGrandTotal += item.qty * item.price)
+              (item) => (expenseGrandTotal += item.price)
             );
 
             return (

src/components/pages/expense/ExpenseRequestContent.tsx

@@ -27,7 +27,7 @@ import {
   UploadRequestDocumentsFormSchema,
   UploadRequestDocumentsFormValues,
 } from '@/components/pages/expense/form/ExpenseRequestForm.schema';
-import { ACCEPTED_FILE_TYPE, S3_PUBLIC_BASE_URL } from '@/config/constant';
+import { ACCEPTED_FILE_TYPE } from '@/config/constant';
 import { ExpenseApi } from '@/services/api/expense';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { EXPENSE_REQUEST_APPROVAL_LINE } from '@/config/approval-line';
@@ -59,40 +59,34 @@ const ExpenseRequestContent = ({
 
   const isLatestApprovalRejectedOrDone =
     isLatestApprovalRejected ||
-    initialValues?.latest_approval.step_number === 6;
+    initialValues?.latest_approval.step_number === 5;
 
-  const isCurrentApprovalOnHeadArea =
+  const isCurrentApprovalOnManager =
     !isLatestApprovalRejected &&
     initialValues?.latest_approval.step_number === 1;
 
-  const isCurrentApprovalOnUnitVicePresident =
+  const isCurrentApprovalOnFinance =
     !isLatestApprovalRejected &&
     initialValues?.latest_approval.step_number === 2;
 
-  const isCurrentApprovalOnFinance =
-    !isLatestApprovalRejected &&
-    initialValues?.latest_approval.step_number === 3;
-
   const isCurrentApprovalOnRealization =
     !isLatestApprovalRejected &&
-    initialValues?.latest_approval.step_number === 5;
+    initialValues?.latest_approval.step_number === 4;
 
   const showEditButton =
-    initialValues?.latest_approval.step_number !== 6 &&
-    (initialValues?.latest_approval.step_number === 1 ||
-      initialValues?.latest_approval.step_number === 2 ||
-      initialValues?.latest_approval.step_number === 3 ||
-      initialValues?.latest_approval.step_number === 4);
-
-  const showRejectButton =
-    !isLatestApprovalRejected &&
+    initialValues?.latest_approval.step_number !== 5 &&
     (initialValues?.latest_approval.step_number === 1 ||
       initialValues?.latest_approval.step_number === 2 ||
       initialValues?.latest_approval.step_number === 3);
 
+  const showRejectButton =
+    !isLatestApprovalRejected &&
+    (initialValues?.latest_approval.step_number === 1 ||
+      initialValues?.latest_approval.step_number === 2);
+
   const isExpenseCanBeRealized =
     !isLatestApprovalRejected &&
-    initialValues?.latest_approval.step_number === 4;
+    initialValues?.latest_approval.step_number === 3;
 
   // Modal hooks
   const deleteModal = useModal();
@@ -146,17 +140,17 @@ const ExpenseRequestContent = ({
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
-    const deleteResponse = await ExpenseApi.delete(initialValues?.id as number);
+    try {
+      await ExpenseApi.delete(initialValues?.id as number);
 
-    if (isResponseSuccess(deleteResponse)) {
       toast.success('Berhasil menghapus data biaya operasional!');
       router.push('/expense');
-    } else {
+    } catch (error) {
       toast.error('Gagal menghapus data biaya operasional!');
+    } finally {
+      deleteModal.closeModal();
+      setIsDeleteLoading(false);
     }
-
-    deleteModal.closeModal();
-    setIsDeleteLoading(false);
   };
 
   const confirmationModalCompleteClickHandler = async () => {
@@ -180,15 +174,8 @@ const ExpenseRequestContent = ({
 
     let approveResponse: BaseApiResponse<Expense> | undefined = undefined;
 
-    if (isCurrentApprovalOnHeadArea) {
-      approveResponse = await ExpenseApi.approveHeadArea(
-        initialValues.id,
-        notes
-      );
-    }
-
-    if (isCurrentApprovalOnUnitVicePresident) {
-      approveResponse = await ExpenseApi.approveUnitVicePresident(
+    if (isCurrentApprovalOnManager) {
+      approveResponse = await ExpenseApi.approveManager(
         initialValues.id,
         notes
       );
@@ -220,15 +207,8 @@ const ExpenseRequestContent = ({
 
     let rejectResponse: BaseApiResponse<Expense> | undefined = undefined;
 
-    if (isCurrentApprovalOnHeadArea) {
-      rejectResponse = await ExpenseApi.rejectHeadArea(initialValues.id, notes);
-    }
-
-    if (isCurrentApprovalOnUnitVicePresident) {
-      rejectResponse = await ExpenseApi.rejectUnitVicePresident(
-        initialValues.id,
-        notes
-      );
+    if (isCurrentApprovalOnManager) {
+      rejectResponse = await ExpenseApi.rejectManager(initialValues.id, notes);
     }
 
     if (isCurrentApprovalOnFinance) {
@@ -251,13 +231,6 @@ const ExpenseRequestContent = ({
 
   const requestDocumentsChangeHandler = (val: File[]) => {
     formik.setFieldTouched('documents', true);
-
-    const invalidFiles = val.filter((file) => file.size > 5 * 1024 * 1024);
-    if (invalidFiles.length > 0) {
-      toast.error('Ukuran dokumen maksimal 5 MB!');
-      return;
-    }
-
     formik.setFieldValue('documents', val);
   };
 
@@ -282,8 +255,8 @@ const ExpenseRequestContent = ({
           {/* TODO: apply RBAC */}
 
           <div className='w-full max-w-5xl mx-auto flex flex-col sm:flex-row justify-end gap-2'>
-            {isCurrentApprovalOnHeadArea && (
-              <RequirePermission permissions='lti.expense.approve.head_area'>
+            {isCurrentApprovalOnManager && (
+              <RequirePermission permissions='lti.expense.approve.manager'>
                 <Button
                   variant='outline'
                   color='info'
@@ -291,21 +264,7 @@ const ExpenseRequestContent = ({
                   className='w-full sm:w-fit'
                 >
                   <Icon icon='lucide-lab:farm' width={24} height={24} />
-                  Approve Head Area
-                </Button>
-              </RequirePermission>
-            )}
-
-            {isCurrentApprovalOnUnitVicePresident && (
-              <RequirePermission permissions='lti.expense.approve.unit_vice_president'>
-                <Button
-                  variant='outline'
-                  color='success'
-                  onClick={approveClickHandler}
-                  className='w-full sm:w-fit'
-                >
-                  <Icon icon='tdesign:money' width={24} height={24} />
-                  Approve Unit Vice President
+                  Approve Manager
                 </Button>
               </RequirePermission>
             )}
@@ -345,8 +304,7 @@ const ExpenseRequestContent = ({
             {showRejectButton && (
               <RequirePermission
                 permissions={[
-                  'lti.expense.approve.head_area',
-                  'lti.expense.approve.unit_vice_president',
+                  'lti.expense.approve.manager',
                   'lti.expense.approve.finance',
                 ]}
               >
@@ -450,13 +408,9 @@ const ExpenseRequestContent = ({
                   <th>Kandang</th>
                   <th>:</th>
                   <td>
-                    {initialValues?.kandangs &&
-                    initialValues?.kandangs.some((k) => k.name)
-                      ? initialValues?.kandangs
-                          .filter((item) => item.name)
-                          .map((item) => item.name)
-                          .join(', ')
-                      : '-'}
+                    {initialValues?.kandangs
+                      .map((item) => item.name)
+                      .join(', ')}
                   </td>
                 </tr>
                 <tr>
@@ -494,14 +448,7 @@ const ExpenseRequestContent = ({
                 <tr>
                   <th>Nominal Biaya</th>
                   <th>:</th>
-                  <td>
-                    {formatCurrency(
-                      initialValues?.latest_approval.step_number === 5 ||
-                        initialValues?.latest_approval.step_number === 6
-                        ? (initialValues?.total_realisasi ?? 0)
-                        : (initialValues?.total_pengajuan ?? 0)
-                    )}
-                  </td>
+                  <td>{formatCurrency(initialValues?.grand_total ?? 0)}</td>
                 </tr>
                 <tr>
                   <th>Status Pencairan</th>
@@ -535,32 +482,24 @@ const ExpenseRequestContent = ({
                         initialValues?.documents.length > 0 && (
                           <ul className='list-disc'>
                             {initialValues?.documents.map(
-                              (requestDocument, requestDocumentIdx) => {
-                                const path = requestDocument.path.startsWith(
-                                  '/'
-                                )
-                                  ? requestDocument.path.slice(1)
-                                  : requestDocument.path;
-                                const documentUrl = `${S3_PUBLIC_BASE_URL}/${path}`;
-                                return (
-                                  <li key={requestDocumentIdx}>
-                                    <Link
-                                      href={documentUrl}
-                                      target='_blank'
-                                      rel='noopener noreferrer'
-                                      className='text-blue-500 underline'
-                                    >
-                                      {requestDocument.path}{' '}
-                                      <Icon
-                                        icon='cuida:open-in-new-tab-outline'
-                                        width={12}
-                                        height={12}
-                                        className='inline'
-                                      />
-                                    </Link>
-                                  </li>
-                                );
-                              }
+                              (requestDocument, requestDocumentIdx) => (
+                                <li key={requestDocumentIdx}>
+                                  <Link
+                                    href={requestDocument.path}
+                                    target='_blank'
+                                    rel='noopener noreferrer'
+                                    className='text-blue-500 underline'
+                                  >
+                                    {requestDocument.path}{' '}
+                                    <Icon
+                                      icon='cuida:open-in-new-tab-outline'
+                                      width={12}
+                                      height={12}
+                                      className='inline'
+                                    />
+                                  </Link>
+                                </li>
+                              )
                             )}
                           </ul>
                         )}
@@ -619,7 +558,7 @@ const ExpenseRequestContent = ({
                 let expenseGrandTotal = 0;
 
                 kandangExpense.pengajuans?.forEach(
-                  (item) => (expenseGrandTotal += item.qty * item.price)
+                  (item) => (expenseGrandTotal += item.price)
                 );
 
                 return (
@@ -634,9 +573,7 @@ const ExpenseRequestContent = ({
                             colSpan={5}
                             className='font-bold text-center text-base-content text-lg'
                           >
-                            {kandangExpense.kandang_id && kandangExpense.name
-                              ? `Biaya ${kandangExpense.name}`
-                              : `Biaya ${initialValues?.location.name || 'Umum'}`}
+                            Biaya {kandangExpense.name}
                           </th>
                         </tr>
                         <tr>

src/components/pages/expense/ExpenseStatusBadge.tsx

@@ -21,7 +21,7 @@ const ExpenseStatusBadge = ({ approval }: ExpenseStatusBadgeProps) => {
 
   switch (latestApprovalStepNumber) {
     case 1:
-      expenseStatusPillBadgeColor = 'gray';
+      expenseStatusPillBadgeColor = 'yellow';
       break;
 
     case 2:
@@ -33,16 +33,12 @@ const ExpenseStatusBadge = ({ approval }: ExpenseStatusBadgeProps) => {
       break;
 
     case 4:
-      expenseStatusPillBadgeColor = 'yellow';
+      expenseStatusPillBadgeColor = 'red';
       break;
 
     case 5:
       expenseStatusPillBadgeColor = 'green';
       break;
-
-    case 6:
-      expenseStatusPillBadgeColor = 'green';
-      break;
   }
 
   if (isLatestApprovalRejected) {

src/components/pages/expense/ExpensesTable.tsx

@@ -55,16 +55,15 @@ const RowOptionsMenu = ({
   deleteClickHandler: () => void;
 }) => {
   const showEditButton =
-    props.row.original.latest_approval.step_number !== 6 &&
+    props.row.original.latest_approval.step_number !== 5 &&
     (props.row.original.latest_approval.step_number === 1 ||
       props.row.original.latest_approval.step_number === 2 ||
-      props.row.original.latest_approval.step_number === 3 ||
-      props.row.original.latest_approval.step_number === 4);
+      props.row.original.latest_approval.step_number === 3);
 
   // TODO: apply RBAC
   const showRealizationButton =
     props.row.original.latest_approval.action !== 'REJECTED' &&
-    props.row.original.latest_approval.step_number === 4;
+    props.row.original.latest_approval.step_number === 3;
 
   return (
     <RowOptionsMenuWrapper type={type}>
@@ -194,7 +193,7 @@ const ExpensesTable = () => {
     parseInt(item)
   );
 
-  const isAllSelectedRowLatestApprovalOnHeadArea = useMemo(() => {
+  const isAllSelectedRowLatestApprovalOnManager = useMemo(() => {
     return selectedRowIds.every((rowId) => {
       if (!isResponseSuccess(expenses)) return false;
 
@@ -203,28 +202,11 @@ const ExpensesTable = () => {
       const isLatestApprovalRejected =
         expenseItem?.latest_approval.action === 'REJECTED';
 
-      const isCurrentApprovalOnHeadArea =
+      const isCurrentApprovalOnManager =
         !isLatestApprovalRejected &&
         expenseItem?.latest_approval.step_number === 1;
 
-      return isCurrentApprovalOnHeadArea;
-    });
-  }, [expenses, selectedRowIds]);
-
-  const isAllSelectedRowLatestApprovalOnUnitVicePresident = useMemo(() => {
-    return selectedRowIds.every((rowId) => {
-      if (!isResponseSuccess(expenses)) return false;
-
-      const expenseItem = expenses.data.find((item) => item.id === rowId);
-
-      const isLatestApprovalRejected =
-        expenseItem?.latest_approval.action === 'REJECTED';
-
-      const isCurrentApprovalOnUnitVicePresident =
-        !isLatestApprovalRejected &&
-        expenseItem?.latest_approval.step_number === 2;
-
-      return isCurrentApprovalOnUnitVicePresident;
+      return isCurrentApprovalOnManager;
     });
   }, [expenses, selectedRowIds]);
 
@@ -239,7 +221,7 @@ const ExpensesTable = () => {
 
       const isCurrentApprovalOnFinance =
         !isLatestApprovalRejected &&
-        expenseItem?.latest_approval.step_number === 3;
+        expenseItem?.latest_approval.step_number === 2;
 
       return isCurrentApprovalOnFinance;
     });
@@ -256,7 +238,7 @@ const ExpensesTable = () => {
 
       const isCurrentApprovalOnRealization =
         !isLatestApprovalRejected &&
-        expenseItem?.latest_approval.step_number === 5;
+        expenseItem?.latest_approval.step_number === 4;
 
       return isCurrentApprovalOnRealization;
     });
@@ -415,7 +397,7 @@ const ExpensesTable = () => {
   ) => {
     return (
       row.original.latest_approval.action !== 'REJECTED' &&
-      row.original.latest_approval.step_number !== 6
+      row.original.latest_approval.step_number !== 5
     );
   };
 
@@ -438,19 +420,11 @@ const ExpensesTable = () => {
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
-    const deleteResponse = await ExpenseApi.delete(
-      selectedExpense?.id as number
-    );
-
-    if (isResponseSuccess(deleteResponse)) {
-      refreshExpenses();
-      deleteModal.closeModal();
-      toast.success('Berhasil menghapus biaya operasional!');
-    } else {
-      deleteModal.closeModal();
-      toast.error('Gagal menghapus biaya operasional!');
-    }
+    await ExpenseApi.delete(selectedExpense?.id as number);
+    refreshExpenses();
 
+    deleteModal.closeModal();
+    toast.success('Berhasil menghapus biaya operasional!');
     setIsDeleteLoading(false);
   };
 
@@ -459,13 +433,8 @@ const ExpensesTable = () => {
 
     let bulkApproveResponse: BaseApiResponse<Expense> | undefined = undefined;
 
-    if (isAllSelectedRowLatestApprovalOnHeadArea) {
-      bulkApproveResponse = await ExpenseApi.bulkApproveHeadArea(
-        selectedRowIds,
-        notes
-      );
-    } else if (isAllSelectedRowLatestApprovalOnUnitVicePresident) {
-      bulkApproveResponse = await ExpenseApi.bulkApproveUnitVicePresident(
+    if (isAllSelectedRowLatestApprovalOnManager) {
+      bulkApproveResponse = await ExpenseApi.bulkApproveManager(
         selectedRowIds,
         notes
       );
@@ -501,13 +470,8 @@ const ExpensesTable = () => {
 
     let bulkRejectResponse: BaseApiResponse<Expense> | undefined = undefined;
 
-    if (isAllSelectedRowLatestApprovalOnHeadArea) {
-      bulkRejectResponse = await ExpenseApi.bulkRejectHeadArea(
-        selectedRowIds,
-        notes
-      );
-    } else if (isAllSelectedRowLatestApprovalOnUnitVicePresident) {
-      bulkRejectResponse = await ExpenseApi.bulkRejectUnitVicePresident(
+    if (isAllSelectedRowLatestApprovalOnManager) {
+      bulkRejectResponse = await ExpenseApi.bulkRejectManager(
         selectedRowIds,
         notes
       );
@@ -622,31 +586,16 @@ const ExpensesTable = () => {
 
                 {selectedRowIds.length > 0 && (
                   <>
-                    <RequirePermission permissions='lti.expense.approve.head_area'>
+                    <RequirePermission permissions='lti.expense.approve.manager'>
                       <Button
                         variant='outline'
                         color='info'
                         onClick={bulkApproveClickHandler}
-                        disabled={!isAllSelectedRowLatestApprovalOnHeadArea}
+                        disabled={!isAllSelectedRowLatestApprovalOnManager}
                         className='w-full sm:w-fit'
                       >
                         <Icon icon='lucide-lab:farm' width={24} height={24} />
-                        Approve Head Area
-                      </Button>
-                    </RequirePermission>
-
-                    <RequirePermission permissions='lti.expense.approve.unit_vice_president'>
-                      <Button
-                        variant='outline'
-                        color='success'
-                        onClick={bulkApproveClickHandler}
-                        disabled={
-                          !isAllSelectedRowLatestApprovalOnUnitVicePresident
-                        }
-                        className='w-full sm:w-fit'
-                      >
-                        <Icon icon='tdesign:money' width={24} height={24} />
-                        Approve Unit Vice President
+                        Approve Manager
                       </Button>
                     </RequirePermission>
 
@@ -665,8 +614,7 @@ const ExpensesTable = () => {
 
                     <RequirePermission
                       permissions={[
-                        'lti.expense.approve.head_area',
-                        'lti.expense.approve.unit_vice_president',
+                        'lti.expense.approve.manager',
                         'lti.expense.approve.finance',
                       ]}
                     >
@@ -675,8 +623,7 @@ const ExpensesTable = () => {
                         color='error'
                         onClick={bulkRejectClickHandler}
                         disabled={
-                          !isAllSelectedRowLatestApprovalOnHeadArea &&
-                          !isAllSelectedRowLatestApprovalOnUnitVicePresident &&
+                          !isAllSelectedRowLatestApprovalOnManager &&
                           !isAllSelectedRowLatestApprovalOnFinance
                         }
                         className='w-full sm:w-fit'

src/components/pages/expense/RealizationStatusBadge.tsx

@@ -9,7 +9,7 @@ interface RealizationStatusBadgeProps {
 const RealizationStatusBadge = ({ approval }: RealizationStatusBadgeProps) => {
   const isLatestApprovalRejected = approval?.action === 'REJECTED';
 
-  const isExpenseRealized = approval?.step_number && approval.step_number >= 5;
+  const isExpenseRealized = approval?.step_number && approval.step_number >= 4;
 
   const realizationStatus = isExpenseRealized
     ? 'Sudah Realisasi'

src/components/pages/expense/form/ExpenseKandangsTable.tsx

@@ -20,10 +20,10 @@ interface ExpenseKandangsTableProps {
   locationId?: number;
   type: 'add' | 'edit' | 'detail';
   selectedKandangs: {
-    id?: number;
-    name?: string;
+    id: number;
+    name: string;
   }[];
-  onChange: (kandangs: { id?: number; name?: string }[]) => void;
+  onChange: (kandangs: { id: number; name: string }[]) => void;
   className?: {
     wrapper?: string;
   };
@@ -67,11 +67,7 @@ const ExpenseKandangsTable = ({
   );
   const [sorting, setSorting] = useState<SortingState>([]);
   const [rowSelection, setRowSelection] = useState<Record<string, boolean>>(
-    convertRowSelectionArrToObj(
-      selectedKandangs
-        .map((item) => item.id)
-        .filter((id): id is number => id !== undefined)
-    )
+    convertRowSelectionArrToObj(selectedKandangs.map((item) => item.id))
   );
 
   const kandangsColumns: ColumnDef<Kandang>[] = [

src/components/pages/expense/form/ExpenseRealizationForm.schema.ts

@@ -1,7 +1,6 @@
 import * as Yup from 'yup';
 import { Expense } from '@/types/api/expense';
 import { formatDate } from '@/lib/helper';
-import { S3_PUBLIC_BASE_URL } from '@/config/constant';
 
 type ExpenseRealizationFormSchemaType = {
   category?: {
@@ -13,7 +12,7 @@ type ExpenseRealizationFormSchemaType = {
     label: string;
   };
   realization_date?: string;
-  kandangs?: { id?: number; name?: string }[];
+  kandangs?: { id: number; name: string }[];
   supplier?: {
     value: number;
     label: string;
@@ -21,7 +20,7 @@ type ExpenseRealizationFormSchemaType = {
   existing_documents?: { name: string; url: string }[];
   documents?: File[];
   realizations: {
-    kandang_id?: number;
+    kandang_id: number;
     cost_items: {
       nonstock?: {
         value: number;
@@ -50,11 +49,12 @@ export const ExpenseRealizationFormSchema: Yup.ObjectSchema<ExpenseRealizationFo
     kandangs: Yup.array()
       .of(
         Yup.object({
-          id: Yup.number().optional(),
-          name: Yup.string().optional(),
+          id: Yup.number().required('Kandang wajib dipilih!'),
+          name: Yup.string().required('Kandang wajib dipilih!'),
         })
       )
-      .optional(),
+      .min(1, 'Kandang wajib dipilih!')
+      .required('Kandang wajib dipilih!'),
 
     supplier: Yup.object({
       value: Yup.number().min(1).required(),
@@ -73,7 +73,7 @@ export const ExpenseRealizationFormSchema: Yup.ObjectSchema<ExpenseRealizationFo
     realizations: Yup.array()
       .of(
         Yup.object({
-          kandang_id: Yup.number().min(1, 'Wajib memilih kandang!').optional(),
+          kandang_id: Yup.number().min(1, 'Wajib memilih kandang!').required(),
           cost_items: Yup.array()
             .of(
               Yup.object({
@@ -86,12 +86,12 @@ export const ExpenseRealizationFormSchema: Yup.ObjectSchema<ExpenseRealizationFo
                 notes: Yup.string(),
               })
             )
-            .min(1, 'Harus memiliki setidaknya 1 biaya!')
-            .required('Biaya wajib diisi!'),
+            .min(1, 'Kandang harus memiliki setidaknya 1 biaya!')
+            .required('Biaya kandang wajib diisi!'),
         })
       )
-      .min(1, 'Biaya wajib diisi!')
-      .required('Biaya wajib diisi!'),
+      .min(1, 'Biaya kandang wajib diisi!')
+      .required('Biaya kandang wajib diisi!'),
   });
 
 export const UpdateExpenseRealizationFormSchema = ExpenseRealizationFormSchema;
@@ -139,13 +139,10 @@ export const getExpenseRealizationFormInitialValues = (
           label: initialValues.supplier.name,
         }
       : undefined,
-    existing_documents: initialValues?.realization_docs?.map((doc) => {
-      const path = doc.path.startsWith('/') ? doc.path.slice(1) : doc.path;
-      return {
-        name: doc.path,
-        url: `${S3_PUBLIC_BASE_URL}/${path}`,
-      };
-    }),
+    existing_documents: initialValues?.realization_docs?.map((doc) => ({
+      name: doc.path,
+      url: doc.path,
+    })),
     documents: [],
     realizations: initialValues?.kandangs
       ? initialValues.kandangs.map((kandangExpense) => {

src/components/pages/expense/form/ExpenseRealizationForm.tsx

@@ -150,10 +150,25 @@ const ExpenseRealizationForm = ({
     formik.setFieldValue('location', val);
 
     formik.setFieldValue('kandangs', []);
+    formik.setFieldValue('realizations', []);
+  };
 
-    // Auto-create realization item for location (without kandang)
-    formik.setFieldValue('realizations', [
-      {
+  const kandangsChangeHandler = (kandangs: { id: number; name: string }[]) => {
+    formik.setFieldTouched('kandangs', true);
+    formik.setFieldValue('kandangs', kandangs);
+
+    const newRealizations = [...(formik.values.realizations ?? [])];
+
+    // add new realizations
+    kandangs.forEach((kandangItem) => {
+      const isKandangExistInRealization = newRealizations.find(
+        (realizationItem) => realizationItem.kandang_id === kandangItem.id
+      );
+
+      if (isKandangExistInRealization) return;
+
+      newRealizations.push({
+        kandang_id: kandangItem.id,
         cost_items: [
           {
             nonstock: undefined,
@@ -162,57 +177,25 @@ const ExpenseRealizationForm = ({
             notes: '',
           },
         ],
-      },
-    ]);
-  };
-
-  const kandangsChangeHandler = (
-    kandangs: { id?: number; name?: string }[]
-  ) => {
-    formik.setFieldTouched('kandangs', true);
-    formik.setFieldValue('kandangs', kandangs);
-
-    // If no kandangs selected, create realization item for location
-    if (kandangs.length === 0) {
-      formik.setFieldValue('realizations', [
-        {
-          cost_items: [
-            {
-              nonstock: undefined,
-              quantity: undefined,
-              price: undefined,
-              notes: '',
-            },
-          ],
-        },
-      ]);
-      return;
-    }
-
-    // Start with empty array when kandangs are selected
-    const newRealizations: typeof formik.values.realizations = [];
-
-    // add new realizations for each kandang
-    kandangs.forEach((kandangItem) => {
-      if (!kandangItem.id) return;
-
-      const existingRealization = formik.values.realizations?.find(
-        (realizationItem) => realizationItem.kandang_id === kandangItem.id
-      );
-
-      newRealizations.push({
-        kandang_id: kandangItem.id,
-        cost_items: existingRealization?.cost_items || [
-          {
-            nonstock: undefined,
-            quantity: undefined,
-            price: undefined,
-            notes: '',
-          },
-        ],
       });
     });
 
+    // prune realizations
+    const kandangIds = new Set(kandangs.map((kandang) => kandang.id));
+    const deletedRealizationsIdx: number[] = [];
+
+    newRealizations.forEach((realization, idx) => {
+      const isRealizationValid = kandangIds.has(realization.kandang_id);
+
+      if (!isRealizationValid) {
+        deletedRealizationsIdx.push(idx);
+      }
+    });
+
+    deletedRealizationsIdx.forEach((deletedRealizationIdx) => {
+      newRealizations.splice(deletedRealizationIdx, 1);
+    });
+
     formik.setFieldValue('realizations', newRealizations);
   };
 
@@ -223,13 +206,6 @@ const ExpenseRealizationForm = ({
 
   const realizationDocumentsChangeHandler = (val: File[]) => {
     formik.setFieldTouched('documents', true);
-
-    const invalidFiles = val.filter((file) => file.size > 5 * 1024 * 1024);
-    if (invalidFiles.length > 0) {
-      toast.error('Ukuran dokumen maksimal 5 MB!');
-      return;
-    }
-
     formik.setFieldValue('documents', val);
   };
 
@@ -362,10 +338,7 @@ const ExpenseRealizationForm = ({
             )}
 
           <ExpenseRealizationKandangDetailExpense
-            type={type}
             formik={formik}
-            supplierId={formik.values.supplier?.value as number}
-            location={formik.values.location}
             className={{
               wrapper: 'col-span-12',
             }}

src/components/pages/expense/form/ExpenseRealizationKandangDetailExpense.tsx

@@ -18,11 +18,6 @@ import { Nonstock } from '@/types/api/master-data/nonstock';
 interface ExpenseRealizationKandangDetailExpenseProps {
   type?: 'add' | 'edit' | 'detail';
   formik: FormikContextType<ExpenseRealizationFormValues>;
-  supplierId?: number;
-  location?: {
-    value: number;
-    label: string;
-  };
   className?: {
     wrapper?: string;
   };
@@ -30,18 +25,12 @@ interface ExpenseRealizationKandangDetailExpenseProps {
 
 const ExpenseRealizationKandangDetailExpense: React.FC<
   ExpenseRealizationKandangDetailExpenseProps
-> = ({ type, formik, supplierId, location, className }) => {
+> = ({ type, formik, className }) => {
   const {
     setInputValue: setNonstockInputValue,
     options: nonstockOptions,
     isLoadingOptions: isLoadingNonstockOptions,
-  } = useSelect<Nonstock>(
-    NonstockApi.basePath,
-    'id',
-    'name',
-    'search',
-    supplierId ? { supplier_id: String(supplierId) } : undefined
-  );
+  } = useSelect<Nonstock>(NonstockApi.basePath, 'id', 'name');
 
   const nonstockChangeHandler = (
     kandangExpenseIdx: number,
@@ -93,159 +82,140 @@ const ExpenseRealizationKandangDetailExpense: React.FC<
       </div>
 
       <div className='w-full flex flex-col gap-6'>
-        {!formik.values.supplier?.value && (
+        {formik.values.realizations.length === 0 && (
           <div>
             <p className='text-sm text-gray-400 text-center'>
-              Pilih supplier terlebih dahulu!
+              Pilih kandang terlebih dahulu!
             </p>
           </div>
         )}
 
-        {formik.values.realizations.length === 0 &&
-          formik.values.supplier?.value && (
-            <div>
-              <p className='text-sm text-gray-400 text-center'>
-                Belum ada item biaya. Silakan pilih lokasi terlebih dahulu.
-              </p>
-            </div>
-          )}
+        {formik.values.realizations.map((kandangExpense, kandangExpenseIdx) => {
+          const kandangName = formik.values.kandangs?.find(
+            (kandang) => kandang.id === kandangExpense.kandang_id
+          );
 
-        {formik.values.realizations.length > 0 &&
-          formik.values.supplier?.value &&
-          formik.values.realizations.map(
-            (kandangExpense, kandangExpenseIdx) => {
-              const kandangName = kandangExpense.kandang_id
-                ? formik.values.kandangs?.find(
-                    (kandang) => kandang.id === kandangExpense.kandang_id
-                  )
-                : null;
+          return (
+            kandangName?.name && (
+              <div
+                key={`kandangExpense-${kandangExpenseIdx}`}
+                className='w-full flex flex-col gap-4'
+              >
+                <div>
+                  <h5 className='mb-2 text-lg font-bold text-center'>
+                    Biaya {kandangName?.name}
+                  </h5>
 
-              return (
-                (kandangName?.name || !kandangExpense.kandang_id) && (
-                  <div
-                    key={`kandangExpense-${kandangExpenseIdx}`}
-                    className='w-full flex flex-col gap-4'
-                  >
-                    <div>
-                      <h5 className='mb-2 text-lg font-bold text-center'>
-                        {kandangName?.name
-                          ? `Biaya ${kandangName.name}`
-                          : location?.label
-                            ? `Biaya ${location.label}`
-                            : 'Biaya Umum'}
-                      </h5>
+                  <div className='overflow-x-auto'>
+                    <table className='table'>
+                      <thead>
+                        <tr>
+                          <th>Nonstock</th>
+                          <th>Total Kuantitas</th>
+                          <th>Harga Satuan</th>
+                          <th>Catatan</th>
+                        </tr>
+                      </thead>
 
-                      <div className='overflow-x-auto'>
-                        <table className='table'>
-                          <thead>
-                            <tr>
-                              <th>Nonstock</th>
-                              <th>Total Kuantitas</th>
-                              <th>Harga Satuan</th>
-                              <th>Catatan</th>
+                      <tbody>
+                        {kandangExpense.cost_items.map(
+                          (expenseItem, expenseIdx) => (
+                            <tr key={`expense-${expenseIdx}`}>
+                              <td className='p-2'>
+                                <SelectInput
+                                  placeholder='Pilih Nonstock'
+                                  value={expenseItem.nonstock}
+                                  onChange={(val) => {
+                                    nonstockChangeHandler(
+                                      kandangExpenseIdx,
+                                      expenseIdx,
+                                      val
+                                    );
+                                  }}
+                                  options={nonstockOptions}
+                                  isLoading={isLoadingNonstockOptions}
+                                  onInputChange={setNonstockInputValue}
+                                  className={{ wrapper: 'min-w-48' }}
+                                  isDisabled
+                                />
+                              </td>
+
+                              <td className='p-2'>
+                                <NumberInput
+                                  required
+                                  name={`realizations[${kandangExpenseIdx}].cost_items[${expenseIdx}].quantity`}
+                                  placeholder='Masukkan Total Kuantitas'
+                                  value={
+                                    formik.values.realizations[
+                                      kandangExpenseIdx
+                                    ].cost_items[expenseIdx].quantity ?? ''
+                                  }
+                                  onChange={formik.handleChange}
+                                  onBlur={formik.handleBlur}
+                                  isError={isExpenseRepeaterInputError(
+                                    'quantity',
+                                    kandangExpenseIdx,
+                                    expenseIdx
+                                  )}
+                                  className={{ wrapper: 'min-w-24' }}
+                                />
+                              </td>
+
+                              <td className='p-2'>
+                                <NumberInput
+                                  name={`realizations[${kandangExpenseIdx}].cost_items[${expenseIdx}].price`}
+                                  placeholder='Masukkan Harga Satuan'
+                                  value={
+                                    formik.values.realizations[
+                                      kandangExpenseIdx
+                                    ].cost_items[expenseIdx].price ?? ''
+                                  }
+                                  onChange={formik.handleChange}
+                                  onBlur={formik.handleBlur}
+                                  isError={isExpenseRepeaterInputError(
+                                    'price',
+                                    kandangExpenseIdx,
+                                    expenseIdx
+                                  )}
+                                  inputPrefix={
+                                    <span className='text-gray-600 font-medium'>
+                                      Rp
+                                    </span>
+                                  }
+                                  className={{ wrapper: 'min-w-24' }}
+                                />
+                              </td>
+
+                              <td className='p-2'>
+                                <TextInput
+                                  name={`realizations[${kandangExpenseIdx}].cost_items[${expenseIdx}].notes`}
+                                  placeholder='Tuliskan catatan'
+                                  value={
+                                    formik.values.realizations[
+                                      kandangExpenseIdx
+                                    ].cost_items[expenseIdx].notes ?? ''
+                                  }
+                                  onChange={formik.handleChange}
+                                  onBlur={formik.handleBlur}
+                                  isError={isExpenseRepeaterInputError(
+                                    'notes',
+                                    kandangExpenseIdx,
+                                    expenseIdx
+                                  )}
+                                  className={{ wrapper: 'min-w-24' }}
+                                />
+                              </td>
                             </tr>
-                          </thead>
-
-                          <tbody>
-                            {kandangExpense.cost_items.map(
-                              (expenseItem, expenseIdx) => (
-                                <tr key={`expense-${expenseIdx}`}>
-                                  <td className='p-2'>
-                                    <SelectInput
-                                      placeholder='Pilih Nonstock'
-                                      value={expenseItem.nonstock}
-                                      onChange={(val) => {
-                                        nonstockChangeHandler(
-                                          kandangExpenseIdx,
-                                          expenseIdx,
-                                          val
-                                        );
-                                      }}
-                                      options={nonstockOptions}
-                                      isLoading={isLoadingNonstockOptions}
-                                      onInputChange={setNonstockInputValue}
-                                      className={{ wrapper: 'min-w-48' }}
-                                      isDisabled
-                                    />
-                                  </td>
-
-                                  <td className='p-2'>
-                                    <NumberInput
-                                      required
-                                      name={`realizations[${kandangExpenseIdx}].cost_items[${expenseIdx}].quantity`}
-                                      placeholder='Masukkan Total Kuantitas'
-                                      value={
-                                        formik.values.realizations[
-                                          kandangExpenseIdx
-                                        ].cost_items[expenseIdx].quantity ?? ''
-                                      }
-                                      onChange={formik.handleChange}
-                                      onBlur={formik.handleBlur}
-                                      isError={isExpenseRepeaterInputError(
-                                        'quantity',
-                                        kandangExpenseIdx,
-                                        expenseIdx
-                                      )}
-                                      className={{ wrapper: 'min-w-24' }}
-                                    />
-                                  </td>
-
-                                  <td className='p-2'>
-                                    <NumberInput
-                                      name={`realizations[${kandangExpenseIdx}].cost_items[${expenseIdx}].price`}
-                                      placeholder='Masukkan Harga Satuan'
-                                      value={
-                                        formik.values.realizations[
-                                          kandangExpenseIdx
-                                        ].cost_items[expenseIdx].price ?? ''
-                                      }
-                                      onChange={formik.handleChange}
-                                      onBlur={formik.handleBlur}
-                                      isError={isExpenseRepeaterInputError(
-                                        'price',
-                                        kandangExpenseIdx,
-                                        expenseIdx
-                                      )}
-                                      inputPrefix={
-                                        <span className='text-gray-600 font-medium'>
-                                          Rp
-                                        </span>
-                                      }
-                                      className={{ wrapper: 'min-w-24' }}
-                                    />
-                                  </td>
-
-                                  <td className='p-2'>
-                                    <TextInput
-                                      name={`realizations[${kandangExpenseIdx}].cost_items[${expenseIdx}].notes`}
-                                      placeholder='Tuliskan catatan'
-                                      value={
-                                        formik.values.realizations[
-                                          kandangExpenseIdx
-                                        ].cost_items[expenseIdx].notes ?? ''
-                                      }
-                                      onChange={formik.handleChange}
-                                      onBlur={formik.handleBlur}
-                                      isError={isExpenseRepeaterInputError(
-                                        'notes',
-                                        kandangExpenseIdx,
-                                        expenseIdx
-                                      )}
-                                      className={{ wrapper: 'min-w-24' }}
-                                    />
-                                  </td>
-                                </tr>
-                              )
-                            )}
-                          </tbody>
-                        </table>
-                      </div>
-                    </div>
+                          )
+                        )}
+                      </tbody>
+                    </table>
                   </div>
-                )
-              );
-            }
-          )}
+                </div>
+              </div>
+            )
+          );
+        })}
       </div>
     </Card>
   );

src/components/pages/expense/form/ExpenseRequestForm.schema.ts

@@ -1,36 +1,32 @@
 import * as Yup from 'yup';
 import { Expense } from '@/types/api/expense';
 import { formatDate } from '@/lib/helper';
-import { S3_PUBLIC_BASE_URL } from '@/config/constant';
 
 type ExpenseFormSchemaType = {
   category?: {
     value: 'BOP' | 'NON-BOP';
     label: 'BOP' | 'NON-BOP';
-  } | null;
+  };
   location?: {
     value: number;
     label: string;
-  } | null;
-  location_id: number;
+  };
   transaction_date?: string;
-  kandangs?: { id?: number; name?: string }[];
+  kandangs?: { id: number; name: string }[];
   supplier?: {
     value: number;
     label: string;
-  } | null;
-  supplier_id: number;
+  };
   existing_documents?: { id: number; name: string; url: string }[];
   deleted_documents?: number[];
   documents?: File[];
   expense_nonstocks: {
-    kandang_id?: number;
+    kandang_id: number;
     cost_items: {
       nonstock?: {
         value: number;
         label: string;
-      } | null;
-      nonstock_id?: number;
+      };
       quantity?: number;
       price?: number;
       notes?: string;
@@ -43,54 +39,36 @@ export const ExpenseRequestFormSchema: Yup.ObjectSchema<ExpenseFormSchemaType> =
     category: Yup.object({
       value: Yup.string().oneOf(['BOP', 'NON-BOP']).required(),
       label: Yup.string().oneOf(['BOP', 'NON-BOP']).required(),
-    })
-      .nullable()
-      .optional(),
+    }).required('Kategori wajib diisi!'),
 
     location: Yup.object({
       value: Yup.number().min(1).required(),
       label: Yup.string().required(),
-    })
-      .nullable()
-      .optional(),
-
-    location_id: Yup.number()
-      .required('Lokasi wajib diisi!')
-      .min(1, 'Lokasi wajib diisi!')
-      .typeError('Lokasi wajib diisi!'),
+    }).required('Lokasi wajib diisi!'),
 
     transaction_date: Yup.string().required('Tanggal transaksi wajib diisi!'),
-
     kandangs: Yup.array()
       .of(
         Yup.object({
-          id: Yup.number().optional(),
-          name: Yup.string().optional(),
+          id: Yup.number().required('Kandang wajib dipilih!'),
+          name: Yup.string().required('Kandang wajib dipilih!'),
         })
       )
-      .optional(),
+      .min(1, 'Kandang wajib dipilih!')
+      .required('Kandang wajib dipilih!'),
 
     supplier: Yup.object({
       value: Yup.number().min(1).required(),
       label: Yup.string().required(),
-    })
-      .nullable()
-      .optional(),
+    }).required('Vendor wajib diisi!'),
 
-    supplier_id: Yup.number()
-      .required('Vendor wajib diisi!')
-      .min(1, 'Vendor wajib diisi!')
-      .typeError('Vendor wajib diisi!'),
-
-    existing_documents: Yup.array()
-      .of(
-        Yup.object({
-          id: Yup.number().required(),
-          name: Yup.string().required(),
-          url: Yup.string().required(),
-        })
-      )
-      .optional(),
+    existing_documents: Yup.array().of(
+      Yup.object({
+        id: Yup.number().required(),
+        name: Yup.string().required(),
+        url: Yup.string().required(),
+      })
+    ),
 
     deleted_documents: Yup.array().of(Yup.number().required()).optional(),
 
@@ -99,24 +77,16 @@ export const ExpenseRequestFormSchema: Yup.ObjectSchema<ExpenseFormSchemaType> =
     expense_nonstocks: Yup.array()
       .of(
         Yup.object({
-          kandang_id: Yup.number().min(1, 'Wajib memilih kandang!').optional(),
+          kandang_id: Yup.number().min(1, 'Wajib memilih kandang!').required(),
           cost_items: Yup.array()
             .of(
               Yup.object({
                 nonstock: Yup.object({
                   value: Yup.number().min(1).required(),
                   label: Yup.string().required(),
-                }).nullable(),
-                nonstock_id: Yup.number()
-                  .required('Nonstock wajib diisi!')
-                  .min(1, 'Nonstock wajib diisi!')
-                  .typeError('Nonstock wajib diisi!'),
-                quantity: Yup.number()
-                  .required('Total kuantitas wajib diisi!')
-                  .typeError('Total kuantitas wajib diisi!'),
-                price: Yup.number()
-                  .required('Harga satuan wajib diisi!')
-                  .typeError('Harga satuan wajib diisi!'),
+                }).required('Nonstock wajib diisi!'),
+                quantity: Yup.number().required('Total kuantitas wajib diisi!'),
+                price: Yup.number().required('Harga satuan wajib diisi!'),
                 notes: Yup.string(),
               })
             )
@@ -131,16 +101,7 @@ export const ExpenseRequestFormSchema: Yup.ObjectSchema<ExpenseFormSchemaType> =
 export const UpdateExpenseRequestFormSchema = ExpenseRequestFormSchema;
 
 export const UploadRequestDocumentsFormSchema = Yup.object({
-  documents: Yup.array()
-    .of(
-      Yup.mixed<File>()
-        .required()
-        .test('fileSize', 'Ukuran dokumen maksimal 5 MB', (value) => {
-          if (!value || !(value instanceof File)) return true;
-          return value.size <= 5 * 1024 * 1024;
-        })
-    )
-    .required(),
+  documents: Yup.array().of(Yup.mixed<File>().required()).required(),
 });
 
 export type ExpenseRequestFormValues = Yup.InferType<
@@ -160,14 +121,13 @@ export const getExpenseFormInitialValues = (
           value: initialValues.category,
           label: initialValues.category,
         }
-      : null,
+      : undefined,
     location: initialValues?.location
       ? {
           value: initialValues.location.id,
           label: initialValues.location.name,
         }
-      : null,
-    location_id: Number(initialValues?.location.id || 0),
+      : undefined,
     transaction_date: initialValues?.transaction_date
       ? formatDate(initialValues.transaction_date, 'YYYY-MM-DD')
       : undefined,
@@ -180,16 +140,12 @@ export const getExpenseFormInitialValues = (
           value: initialValues.supplier.id,
           label: initialValues.supplier.name,
         }
-      : null,
-    supplier_id: initialValues?.supplier?.id ?? 0,
-    existing_documents: initialValues?.documents?.map((doc) => {
-      const path = doc.path.startsWith('/') ? doc.path.slice(1) : doc.path;
-      return {
-        id: doc.id,
-        name: doc.path,
-        url: `${S3_PUBLIC_BASE_URL}/${path}`,
-      };
-    }),
+      : undefined,
+    existing_documents: initialValues?.documents?.map((doc) => ({
+      id: doc.id,
+      name: doc.path,
+      url: doc.path,
+    })),
     deleted_documents: [],
     documents: [],
     expense_nonstocks: initialValues?.kandangs
@@ -201,25 +157,12 @@ export const getExpenseFormInitialValues = (
                   value: expenseItem.nonstock.id,
                   label: expenseItem.nonstock.name,
                 },
-                nonstock_id: expenseItem.nonstock.id,
                 quantity: expenseItem.qty,
                 price: expenseItem.price,
                 notes: expenseItem.note,
               }))
             : [],
         }))
-      : [
-          {
-            cost_items: [
-              {
-                nonstock: null,
-                nonstock_id: 0,
-                quantity: undefined,
-                price: undefined,
-                notes: '',
-              },
-            ],
-          },
-        ],
+      : [],
   };
 };

src/components/pages/expense/form/ExpenseRequestForm.tsx

@@ -37,8 +37,6 @@ import { cn, sleep } from '@/lib/helper';
 import { LocationApi, SupplierApi } from '@/services/api/master-data';
 import { ACCEPTED_FILE_TYPE } from '@/config/constant';
 import { Supplier } from '@/types/api/master-data/supplier';
-import { getUniqueFormikErrors } from '@/lib/formik-helper';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 
 interface ExpenseFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -57,7 +55,6 @@ const ExpenseRequestForm = ({
   const rejectModal = useModal();
 
   const [expenseFormErrorMessage, setExpenseFormErrorMessage] = useState('');
-  const [formErrorList, setFormErrorList] = useState<string[]>([]);
 
   const createExpenseHandler = useCallback(
     async (payload: CreateExpensePayload) => {
@@ -111,24 +108,18 @@ const ExpenseRequestForm = ({
 
       const expensePayload: CreateExpensePayload = {
         category: formik.values.category?.value as 'BOP' | 'NON-BOP',
-        location_id: values.location_id as number,
         transaction_date: values?.transaction_date as string,
         supplier_id: values.supplier?.value as number,
         documents: values.documents as File[],
-        expense_nonstocks: values.expense_nonstocks.map((expenseNonstock) => {
-          const basePayload = {
-            cost_items: expenseNonstock.cost_items.map((costItem) => ({
-              nonstock_id: costItem.nonstock?.value as number,
-              quantity: parseFloat(String(costItem.quantity)) as number,
-              price: parseFloat(String(costItem.price)) as number,
-              notes: costItem.notes ?? '',
-            })),
-          };
-
-          return expenseNonstock.kandang_id
-            ? { ...basePayload, kandang_id: expenseNonstock.kandang_id }
-            : basePayload;
-        }),
+        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,
+            price: parseFloat(String(costItem.price)) as number,
+            notes: costItem.notes ?? '',
+          })),
+        })),
       };
 
       switch (type) {
@@ -139,25 +130,19 @@ const ExpenseRequestForm = ({
         case 'edit':
           const expenseUpdatePayload: UpdateExpensePayload = {
             category: formik.values.category?.value as 'BOP' | 'NON-BOP',
-            location_id: values.location_id as number,
             transaction_date: values?.transaction_date as string,
             supplier_id: values.supplier?.value as number,
             documents: values.documents as File[],
             expense_nonstocks: values.expense_nonstocks.map(
-              (expenseNonstock) => {
-                const basePayload = {
-                  cost_items: expenseNonstock.cost_items.map((costItem) => ({
-                    nonstock_id: costItem.nonstock?.value as number,
-                    quantity: parseFloat(String(costItem.quantity)) as number,
-                    price: parseFloat(String(costItem.price)) as number,
-                    notes: costItem.notes ?? '',
-                  })),
-                };
-
-                return expenseNonstock.kandang_id
-                  ? { ...basePayload, kandang_id: expenseNonstock.kandang_id }
-                  : basePayload;
-              }
+              (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,
+                  price: parseFloat(String(costItem.price)) as number,
+                  notes: costItem.notes ?? '',
+                })),
+              })
             ),
           };
 
@@ -194,67 +179,30 @@ const ExpenseRequestForm = ({
     formik.setFieldTouched('location', true);
     formik.setFieldValue('location', val);
 
-    const locationId = Array.isArray(val) ? val[0]?.value : val?.value;
-    formik.setFieldValue('location_id', locationId);
-
     formik.setFieldValue('kandangs', []);
-
-    // Auto-create expense item for location (without kandang)
-    formik.setFieldValue('expense_nonstocks', [
-      {
-        cost_items: [
-          {
-            nonstock: null,
-            nonstock_id: 0,
-            quantity: undefined,
-            price: undefined,
-            notes: '',
-          },
-        ],
-      },
-    ]);
+    formik.setFieldValue('expense_nonstocks', []);
   };
 
-  const kandangsChangeHandler = (
-    kandangs: { id?: number; name?: string }[]
-  ) => {
+  const kandangsChangeHandler = (kandangs: { id: number; name: string }[]) => {
     formik.setFieldTouched('kandangs', true);
     formik.setFieldValue('kandangs', kandangs);
 
-    // If no kandangs selected, create expense item for location
-    if (kandangs.length === 0) {
-      formik.setFieldValue('expense_nonstocks', [
-        {
-          cost_items: [
-            {
-              nonstock: null,
-              nonstock_id: 0,
-              quantity: undefined,
-              price: undefined,
-              notes: '',
-            },
-          ],
-        },
-      ]);
-      return;
-    }
-
-    const newExpenseNonstocks: typeof formik.values.expense_nonstocks = [];
+    const newExpenseNonstocks = [...(formik.values.expense_nonstocks ?? [])];
 
+    // add new expense_nonstocks
     kandangs.forEach((kandangItem) => {
-      if (!kandangItem.id) return;
-
-      const existingExpenseNonstock = formik.values.expense_nonstocks?.find(
+      const isKandangExistInExpenseNonstocks = newExpenseNonstocks.find(
         (expenseNonstockItem) =>
           expenseNonstockItem.kandang_id === kandangItem.id
       );
 
+      if (isKandangExistInExpenseNonstocks) return;
+
       newExpenseNonstocks.push({
         kandang_id: kandangItem.id,
-        cost_items: existingExpenseNonstock?.cost_items || [
+        cost_items: [
           {
-            nonstock: null,
-            nonstock_id: 0,
+            nonstock: undefined,
             quantity: undefined,
             price: undefined,
             notes: '',
@@ -263,26 +211,32 @@ const ExpenseRequestForm = ({
       });
     });
 
+    // prune expense_nonstocks
+    const kandangIds = new Set(kandangs.map((kandang) => kandang.id));
+    const deletedExpenseNonstocksIdx: number[] = [];
+
+    newExpenseNonstocks.forEach((expenseNonstock, idx) => {
+      const isExpenseNonstockValid = kandangIds.has(expenseNonstock.kandang_id);
+
+      if (!isExpenseNonstockValid) {
+        deletedExpenseNonstocksIdx.push(idx);
+      }
+    });
+
+    deletedExpenseNonstocksIdx.forEach((deletedExpenseNonstockIdx) => {
+      newExpenseNonstocks.splice(deletedExpenseNonstockIdx, 1);
+    });
+
     formik.setFieldValue('expense_nonstocks', newExpenseNonstocks);
   };
 
   const supplierChangeHandler = (val: OptionType | OptionType[] | null) => {
     formik.setFieldTouched('supplier', true);
     formik.setFieldValue('supplier', val);
-
-    const supplierId = Array.isArray(val) ? val[0]?.value : val?.value;
-    formik.setFieldValue('supplier_id', supplierId ?? 0);
   };
 
   const requestDocumentsChangeHandler = (val: File[]) => {
     formik.setFieldTouched('documents', true);
-
-    const invalidFiles = val.filter((file) => file.size > 5 * 1024 * 1024);
-    if (invalidFiles.length > 0) {
-      toast.error('Ukuran dokumen maksimal 5 MB!');
-      return;
-    }
-
     formik.setFieldValue('documents', val);
   };
 
@@ -338,22 +292,6 @@ const ExpenseRequestForm = ({
     router.push('/expense');
   };
 
-  const handleValidateForm = async () => {
-    const errors = await formik.validateForm();
-
-    if (Object.keys(errors).length > 0) {
-      const errorMessages = getUniqueFormikErrors(errors);
-      setFormErrorList(errorMessages);
-      return;
-    }
-  };
-
-  const handleFormSubmit = (e: React.FormEvent<HTMLFormElement>) => {
-    e.preventDefault();
-    handleValidateForm();
-    formik.handleSubmit(e);
-  };
-
   useEffect(() => {
     formikSetValues(getExpenseFormInitialValues(initialValues));
   }, [formikSetValues, getExpenseFormInitialValues, initialValues]);
@@ -379,27 +317,10 @@ const ExpenseRequestForm = ({
         </header>
 
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
-          {expenseFormErrorMessage && (
-            <div role='alert' className='alert alert-error'>
-              <Icon
-                icon='material-symbols:error-outline'
-                width={24}
-                height={24}
-              />
-              <span>{expenseFormErrorMessage}</span>
-            </div>
-          )}
-
-          {formErrorList.length > 0 && (
-            <AlertErrorList
-              formErrorList={formErrorList}
-              onClose={() => setFormErrorList([])}
-            />
-          )}
           <div className='grid grid-cols-12 gap-4'>
             <SelectInput
               label='Kategori'
@@ -533,10 +454,7 @@ const ExpenseRequestForm = ({
               )}
 
             <ExpenseRequestKandangDetailExpense
-              type={type}
               formik={formik}
-              supplierId={formik.values.supplier?.value as number}
-              location={formik.values.location}
               className={{
                 wrapper: 'col-span-12',
               }}
@@ -584,6 +502,17 @@ const ExpenseRequestForm = ({
               </div>
             )}
 
+            {expenseFormErrorMessage && (
+              <div role='alert' className='alert alert-error w-full'>
+                <Icon
+                  icon='material-symbols:error-outline'
+                  width={24}
+                  height={24}
+                />
+                <span>{expenseFormErrorMessage}</span>
+              </div>
+            )}
+
             {type !== 'detail' && (
               <div
                 className={cn('flex flex-row justify-end gap-2', {
@@ -598,7 +527,7 @@ const ExpenseRequestForm = ({
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit

src/components/pages/expense/form/ExpenseRequestKandangDetailExpense.tsx

@@ -21,11 +21,6 @@ import { removeArrayItemAndSync } from '@/lib/utils/formik';
 interface ExpenseRequestKandangDetailExpenseProps {
   type?: 'add' | 'edit' | 'detail';
   formik: FormikContextType<ExpenseRequestFormValues>;
-  supplierId?: number;
-  location?: {
-    value: number;
-    label: string;
-  } | null;
   className?: {
     wrapper?: string;
   };
@@ -33,18 +28,12 @@ interface ExpenseRequestKandangDetailExpenseProps {
 
 const ExpenseRequestKandangDetailExpense: React.FC<
   ExpenseRequestKandangDetailExpenseProps
-> = ({ type, formik, supplierId, location, className }) => {
+> = ({ type, formik, className }) => {
   const {
     setInputValue: setNonstockInputValue,
     options: nonstockOptions,
     isLoadingOptions: isLoadingNonstockOptions,
-  } = useSelect<Nonstock>(
-    NonstockApi.basePath,
-    'id',
-    'name',
-    'search',
-    supplierId ? { supplier_id: String(supplierId) } : undefined
-  );
+  } = useSelect<Nonstock>(NonstockApi.basePath, 'id', 'name');
 
   const nonstockChangeHandler = (
     kandangExpenseIdx: number,
@@ -59,20 +48,13 @@ const ExpenseRequestKandangDetailExpense: React.FC<
       `expense_nonstocks[${kandangExpenseIdx}].cost_items[${expenseIdx}].nonstock`,
       val
     );
-
-    const nonstockId = Array.isArray(val) ? val[0]?.value : val?.value;
-    formik.setFieldValue(
-      `expense_nonstocks[${kandangExpenseIdx}].cost_items[${expenseIdx}].nonstock_id`,
-      nonstockId ?? 0
-    );
   };
 
   const addExpenseItemHandler = (kandangExpenseIdx: number) => {
     const newExpensesValue = [
       ...formik.values.expense_nonstocks[kandangExpenseIdx].cost_items,
       {
-        nonstock: null,
-        nonstock_id: 0,
+        nonstock: undefined,
         price: undefined,
         quantity: undefined,
         notes: '',
@@ -131,57 +113,41 @@ const ExpenseRequestKandangDetailExpense: React.FC<
       </div>
 
       <div className='w-full flex flex-col gap-6'>
-        {!formik.values.supplier?.value && (
+        {(formik.values.expense_nonstocks.length === 0 ||
+          !formik.values.supplier?.value) && (
           <div>
             <p className='text-sm text-gray-400 text-center'>
-              Pilih supplier terlebih dahulu!
+              Pilih kandang terlebih dahulu!
             </p>
           </div>
         )}
 
-        {formik.values.expense_nonstocks.length === 0 &&
-          formik.values.supplier?.value && (
-            <div>
-              <p className='text-sm text-gray-400 text-center'>
-                Belum ada item biaya. Silakan pilih lokasi terlebih dahulu.
-              </p>
-            </div>
-          )}
-
         {formik.values.expense_nonstocks.length > 0 &&
           formik.values.supplier?.value &&
           formik.values.expense_nonstocks.map(
             (kandangExpense, kandangExpenseIdx) => {
-              const kandangName = kandangExpense.kandang_id
-                ? formik.values.kandangs?.find(
-                    (kandang) => kandang.id === kandangExpense.kandang_id
-                  )
-                : null;
+              const kandangName = formik.values.kandangs?.find(
+                (kandang) => kandang.id === kandangExpense.kandang_id
+              );
 
               return (
-                (kandangName?.name || !kandangExpense.kandang_id) && (
+                kandangName?.name && (
                   <div
                     key={`kandangExpense-${kandangExpenseIdx}`}
                     className='w-full flex flex-col gap-4'
                   >
                     <div>
                       <h5 className='mb-2 text-lg font-bold text-center'>
-                        Biaya {kandangName?.name || location?.label || 'Umum'}
+                        Biaya {kandangName?.name}
                       </h5>
 
                       <div className='overflow-x-auto'>
                         <table className='table'>
                           <thead>
                             <tr>
-                              <th className='after:content-["*"] after:text-red-500 after:ml-0.5'>
-                                Nonstock
-                              </th>
-                              <th className='after:content-["*"] after:text-red-500 after:ml-0.5'>
-                                Total Kuantitas
-                              </th>
-                              <th className='after:content-["*"] after:text-red-500 after:ml-0.5'>
-                                Harga Satuan
-                              </th>
+                              <th>Nonstock</th>
+                              <th>Total Kuantitas</th>
+                              <th>Harga Satuan</th>
                               <th>Catatan</th>
                               {type !== 'detail' && <th>Aksi</th>}
                             </tr>

src/components/pages/expense/pdf/ExpensePDF.tsx

@@ -198,7 +198,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
     expense?.latest_approval?.action === 'REJECTED';
   const isExpenseRealized =
     expense?.latest_approval?.step_number &&
-    expense?.latest_approval.step_number >= 5;
+    expense?.latest_approval.step_number >= 4;
 
   const realizationStatus = isExpenseRealized
     ? 'Sudah Realisasi'
@@ -219,13 +219,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
     { label: 'Lokasi', value: expense?.location.name },
     {
       label: 'Kandang',
-      value:
-        expense?.kandangs && expense?.kandangs.some((k) => k.name)
-          ? expense?.kandangs
-              .filter((item) => item.name)
-              .map((item) => item.name)
-              .join(', ')
-          : '-',
+      value: expense?.kandangs.map((item) => item.name).join(', '),
     },
     { label: 'Vendor', value: expense?.supplier.name },
     {
@@ -241,12 +235,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
     { label: 'Nama Pengaju', value: expense?.created_user.name },
     {
       label: 'Nominal Biaya',
-      value: formatCurrency(
-        expense?.latest_approval.step_number === 5 ||
-          expense?.latest_approval.step_number === 6
-          ? (expense?.total_realisasi ?? 0)
-          : (expense?.total_pengajuan ?? 0)
-      ),
+      value: formatCurrency(expense?.grand_total ?? 0),
     },
     {
       label: 'Nominal Pengajuan',
@@ -337,7 +326,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
             let expenseRequestTotal = 0;
 
             kandangExpense.pengajuans?.forEach(
-              (item) => (expenseRequestTotal += item.qty * item.price)
+              (item) => (expenseRequestTotal += item.price)
             );
 
             return (
@@ -346,9 +335,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
                 style={ExpensePDFStyle.kandangExpenseContainer}
               >
                 <Text style={ExpensePDFStyle.kandangExpenseTitle}>
-                  {kandangExpense.kandang_id && kandangExpense.name
-                    ? `Biaya ${kandangExpense.name}`
-                    : `Biaya ${expense?.location.name || 'Umum'}`}
+                  {kandangExpense.name}
                 </Text>
 
                 <View style={ExpensePDFStyle.kandangExpenseTable}>
@@ -497,7 +484,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
             let expenseRealizationTotal = 0;
 
             kandangExpense.realisasi?.forEach(
-              (item) => (expenseRealizationTotal += item.qty * item.price)
+              (item) => (expenseRealizationTotal += item.price)
             );
 
             return (
@@ -506,9 +493,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
                 style={ExpensePDFStyle.kandangExpenseContainer}
               >
                 <Text style={ExpensePDFStyle.kandangExpenseTitle}>
-                  {kandangExpense.kandang_id && kandangExpense.name
-                    ? `Biaya ${kandangExpense.name}`
-                    : `Biaya ${expense?.location.name || 'Umum'}`}
+                  {kandangExpense.name}
                 </Text>
 
                 <View style={ExpensePDFStyle.kandangExpenseTable}>

src/components/pages/finance/FinanceDetail.tsx

@@ -9,7 +9,6 @@ import Table from '@/components/Table';
 import {
   FINANCE_INITIAL_BALANCE_STATUS,
   FINANCE_TRANSACTION_STATUS,
-  FINANCE_INJECTION_STATUS,
 } from '@/config/constant';
 import { formatCurrency, formatDate, formatTitleCase } from '@/lib/helper';
 import { FinanceApi } from '@/services/api/finance';
@@ -34,7 +33,7 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
     },
     {
       label: 'Pihak',
-      value: finance.party.id ? finance.party.name : '-',
+      value: finance.party.name,
     },
     {
       label: 'Tanggal',
@@ -52,7 +51,7 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
   const informasiTransfer = [
     {
       label: 'No. Referensi',
-      value: finance.reference_number ?? '-',
+      value: finance.reference_number,
     },
     {
       label: 'Nomor Rekening',
@@ -70,16 +69,7 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
       label: 'Sisa',
       value: formatCurrency(finance.income_amount),
     },
-  ].filter((item) => {
-    // Hide party account number row if transaction type is INJECTION
-    if (
-      FINANCE_INJECTION_STATUS.includes(finance.transaction_type) &&
-      item.label === `Rekening ${formatTitleCase(finance.party.type)}`
-    ) {
-      return false;
-    }
-    return true;
-  });
+  ];
 
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
@@ -172,19 +162,7 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
             </Button>
           </RequirePermission>
         )}
-        {FINANCE_INJECTION_STATUS.includes(finance.transaction_type) && (
-          <RequirePermission permissions='lti.finance.injections.update'>
-            <Button
-              color='warning'
-              className='min-w-24'
-              href={`/finance/detail/edit/injection?financeId=${finance.id}`}
-            >
-              <Icon icon='mdi:pencil-outline' />
-              Edit
-            </Button>
-          </RequirePermission>
-        )}
-        <RequirePermission permissions='lti.finance.transactions.delete'>
+        <RequirePermission permissions='lti.finance.transaction.delete'>
           <Button
             color='error'
             className='min-w-24'

src/components/pages/finance/FinanceTable.tsx

@@ -49,14 +49,7 @@ const RowOptionsMenu = ({
 }) => {
   return (
     <RowOptionsMenuWrapper type={type}>
-      <RequirePermission
-        permissions={[
-          'lti.finance.transactions.detail',
-          'lti.finance.initial_balances.detail',
-          'lti.finance.injections.detail',
-          'lti.finance.payments.detail',
-        ]}
-      >
+      <RequirePermission permissions='lti.finance.transaction.detail'>
         <Button
           href={`/finance/detail?financeId=${props.row.original.id}`}
           variant='ghost'
@@ -116,7 +109,7 @@ const RowOptionsMenu = ({
         </RequirePermission>
       )}
 
-      <RequirePermission permissions='lti.finance.transactions.delete'>
+      <RequirePermission permissions='lti.finance.transaction.delete'>
         <Button
           onClick={deleteClickHandler}
           variant='ghost'

src/components/pages/finance/add/FormFinanceAdd.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import Button from '@/components/Button';
-import AlertErrorList from '@/components/helper/form/FormErrors';
+import Card from '@/components/Card';
 import { FormHeader } from '@/components/helper/form/FormHeader';
 import DateInput from '@/components/input/DateInput';
 import NumberInput from '@/components/input/NumberInput';
@@ -21,7 +21,6 @@ import {
 } from '@/config/constant';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { formatDate, formatTitleCase } from '@/lib/helper';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 import { FinanceApi } from '@/services/api/finance';
 import { BankApi, CustomerApi, SupplierApi } from '@/services/api/master-data';
 import {
@@ -105,9 +104,6 @@ const FormFinanceAdd = ({
     },
   });
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   // ===== Options =====
   const {
     options: partyOptions,
@@ -184,7 +180,7 @@ const FormFinanceAdd = ({
             title={`${type === 'add' ? 'Tambah' : 'Ubah'} Data Keuangan`}
             backUrl='/finance'
           />
-          <form className='flex flex-col gap-4' onSubmit={handleFormSubmit}>
+          <form className='flex flex-col gap-4' onSubmit={formik.handleSubmit}>
             <SelectInput
               label='Jenis Transaksi'
               placeholder='Pilih jenis transaksi'
@@ -192,8 +188,6 @@ const FormFinanceAdd = ({
               value={formik.values.party_type_option}
               onChange={(value) => {
                 formik.setFieldValue('party_type_option', value);
-                formik.setFieldValue('party_id_option', null);
-                formik.setFieldValue('party_account_number', '');
               }}
               isError={Boolean(
                 formik.touched.party_type_option &&
@@ -388,7 +382,6 @@ const FormFinanceAdd = ({
               }
               required
             />
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
             <div className='flex justify-center gap-4'>
               <Button
                 type='reset'

src/components/pages/finance/add/initial-balance/FormFinanceAddInitialBalance.tsx

@@ -1,10 +1,12 @@
 'use client';
 
 import Button from '@/components/Button';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 import { FormHeader } from '@/components/helper/form/FormHeader';
 import NumberInput from '@/components/input/NumberInput';
-import SelectInput, { useSelect } from '@/components/input/SelectInput';
+import SelectInput, {
+  OptionType,
+  useSelect,
+} from '@/components/input/SelectInput';
 import TextArea from '@/components/input/TextArea';
 import TextInput from '@/components/input/TextInput';
 import {
@@ -15,7 +17,6 @@ import {
   FINANCE_INITIAL_BALANCE_TYPE_OPTIONS,
   FINANCE_PARTY_TYPE_OPTIONS,
 } from '@/config/constant';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { formatTitleCase } from '@/lib/helper';
 import { FinanceApi } from '@/services/api/finance';
@@ -172,9 +173,6 @@ const FormFinanceAddInitialBalance = ({
     [router]
   );
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <section className='w-full max-w-xl mx-auto'>
@@ -183,7 +181,7 @@ const FormFinanceAddInitialBalance = ({
             title={`${type === 'add' ? 'Tambah' : 'Ubah'} Saldo Awal`}
             backUrl='/finance'
           />
-          <form className='flex flex-col gap-4' onSubmit={handleFormSubmit}>
+          <form className='flex flex-col gap-4' onSubmit={formik.handleSubmit}>
             <SelectInput
               label='Jenis Pihak'
               placeholder='Pilih jenis pihak'
@@ -191,8 +189,6 @@ const FormFinanceAddInitialBalance = ({
               value={formik.values.party_type_option}
               onChange={(value) => {
                 formik.setFieldValue('party_type_option', value);
-                formik.setFieldValue('party_id_option', null);
-                formik.setFieldValue('party_account_number', '');
               }}
               isError={Boolean(
                 formik.touched.party_type_option &&
@@ -354,7 +350,6 @@ const FormFinanceAddInitialBalance = ({
               }
               required
             />
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
             <div className='flex justify-center gap-4'>
               <Button
                 type='reset'

src/components/pages/finance/add/injection/FormFinanceInjection.tsx

@@ -1,17 +1,18 @@
 'use client';
 
 import Button from '@/components/Button';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 import { FormHeader } from '@/components/helper/form/FormHeader';
 import DateInput from '@/components/input/DateInput';
 import NumberInput from '@/components/input/NumberInput';
-import SelectInput, { useSelect } from '@/components/input/SelectInput';
+import SelectInput, {
+  OptionType,
+  useSelect,
+} from '@/components/input/SelectInput';
 import TextArea from '@/components/input/TextArea';
 import {
   InjectionFormSchema,
   InjectionFormValues,
 } from '@/components/pages/finance/add/injection/FormFinanceInjection.schema';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { formatDate } from '@/lib/helper';
 import { FinanceApi } from '@/services/api/finance';
@@ -127,9 +128,6 @@ const FormFinanceInjection = ({
     [router]
   );
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <section className='w-full max-w-xl mx-auto'>
@@ -138,7 +136,7 @@ const FormFinanceInjection = ({
             title={`${type === 'add' ? 'Tambah' : 'Ubah'} Injeksi Dana`}
             backUrl='/finance'
           />
-          <form className='flex flex-col gap-4' onSubmit={handleFormSubmit}>
+          <form className='flex flex-col gap-4' onSubmit={formik.handleSubmit}>
             <SelectInput
               label='Bank'
               placeholder='Pilih bank'
@@ -225,7 +223,6 @@ const FormFinanceInjection = ({
               }
               required
             />
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
             <div className='flex justify-center gap-4'>
               <Button
                 type='reset'

src/components/pages/inventory/adjustment/InventoryAdjustmentTable.tsx

@@ -15,7 +15,6 @@ import { Icon } from '@iconify/react';
 import { ColumnDef, ColumnSort, SortingState } from '@tanstack/react-table';
 import { useCallback, useEffect, useState } from 'react';
 import useSWR from 'swr';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 
 const InventoryAdjustmentTable = () => {
   const {

src/components/pages/inventory/adjustment/form/InventoryAdjustmentForm.schema.ts

@@ -1,42 +1,26 @@
 import * as Yup from 'yup';
-import { OptionType } from '@/components/input/SelectInput';
 
 export const InventoryAdjustmentFormSchema = Yup.object({
-  product_category: Yup.mixed<OptionType>()
-    .nullable()
-    .test(
-      'is-valid-option',
-      'Kategori Produk wajib diisi!',
-      (value) => value !== null && value !== undefined
-    ),
+  product_category: Yup.object({
+    value: Yup.number().required('ID Kategori Produk wajib diisi!'),
+    label: Yup.string().required('Nama Kategori Produk wajib diisi!'),
+  }).nullable(),
 
   product_category_id: Yup.number().nullable(),
 
-  product: Yup.mixed<OptionType>()
-    .nullable()
-    .test(
-      'is-valid-option',
-      'Produk wajib diisi!',
-      (value) => value !== null && value !== undefined
-    ),
+  product: Yup.object({
+    value: Yup.number().required('ID Produk wajib diisi!'),
+    label: Yup.string().required('Nama Produk wajib diisi!'),
+  }).nullable(),
 
-  product_id: Yup.number()
-    .nullable()
-    .required('Produk wajib diisi!')
-    .min(1, 'Produk wajib diisi!'),
+  product_id: Yup.number().nullable(),
 
-  warehouse: Yup.mixed<OptionType>()
-    .nullable()
-    .test(
-      'is-valid-option',
-      'Warehouse wajib diisi!',
-      (value) => value !== null && value !== undefined
-    ),
+  warehouse: Yup.object({
+    value: Yup.number().required('ID Gudang wajib diisi!'),
+    label: Yup.string().required('Nama Gudang wajib diisi!'),
+  }).nullable(),
 
-  warehouse_id: Yup.number()
-    .nullable()
-    .required('Warehouse wajib diisi!')
-    .min(1, 'Warehouse wajib diisi!'),
+  warehouse_id: Yup.number().nullable(),
 
   transaction_type: Yup.string()
     .oneOf(['increase', 'decrease'], 'Tipe transaksi tidak valid')

src/components/pages/inventory/adjustment/form/InventoryAdjustmentForm.tsx

@@ -26,8 +26,6 @@ import SelectInput, { OptionType } from '@/components/input/SelectInput';
 import TextInput from '@/components/input/TextInput';
 import { RadioGroup } from '@/components/input/RadioInput';
 import TextArea from '@/components/input/TextArea';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 
 interface InventoryAdjustmentFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -127,7 +125,6 @@ const InventoryAdjustmentForm = ({
 
   const warehouseUrl = `${WarehouseApi.basePath}?${new URLSearchParams({
     search: '',
-    limit: '100',
   }).toString()}`;
   const { data: warehouses, isLoading: isLoadingWarehouses } = useSWR(
     warehouseUrl,
@@ -247,9 +244,6 @@ const InventoryAdjustmentForm = ({
     return decimal ? `${formattedInteger}.${decimal}` : formattedInteger;
   };
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   // Render
   return (
     <>
@@ -271,7 +265,7 @@ const InventoryAdjustmentForm = ({
         </header>
 
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
@@ -395,7 +389,6 @@ const InventoryAdjustmentForm = ({
               readOnly={type === 'detail'}
             />
           </div>
-          <AlertErrorList formErrorList={formErrorList} onClose={close} />
           <div className='flex flex-row justify-between gap-2 flex-wrap'>
             {type !== 'detail' && (
               <div className='flex flex-row justify-end gap-2'>
@@ -411,7 +404,11 @@ const InventoryAdjustmentForm = ({
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={
+                    !formik.isValid ||
+                    formik.isSubmitting ||
+                    formik.values.product == undefined
+                  }
                   className='px-4'
                 >
                   Submit

src/components/pages/inventory/movement/form/MovementForm.schema.ts

@@ -1,5 +1,5 @@
 import * as Yup from 'yup';
-import { Movement, MovementDocument } from '@/types/api/inventory/movement';
+import { Movement } from '@/types/api/inventory/movement';
 
 type MovementFormSchemaType = {
   transfer_reason: string;
@@ -29,7 +29,7 @@ type MovementFormSchemaType = {
   deliveries: {
     delivery_cost?: number | string;
     delivery_cost_per_item?: number | string;
-    document?: File | MovementDocument | null;
+    document?: File | string | null;
     document_path?: string | null;
     driver_name: string;
     vehicle_plate: string;
@@ -61,7 +61,7 @@ export type ProductSchema = {
 export type DeliverySchema = {
   delivery_cost?: number | string;
   delivery_cost_per_item?: number | string;
-  document?: File | MovementDocument | null;
+  document?: File | string | null;
   document_path?: string | null;
   driver_name: string;
   vehicle_plate: string;
@@ -85,10 +85,7 @@ const ProductObjectSchema: Yup.ObjectSchema<ProductSchema> = Yup.object({
     value: Yup.number().min(1).required(),
     label: Yup.string().required(),
   }).nullable(),
-  product_id: Yup.number()
-    .required('Produk wajib diisi!')
-    .min(1, 'Produk wajib diisi!')
-    .typeError('Produk wajib diisi!'),
+  product_id: Yup.number().required('Produk wajib diisi!'),
   product_qty: Yup.number()
     .required('Qty wajib diisi!')
     .min(1, 'Qty minimal 1!')
@@ -100,10 +97,7 @@ const DeliveryProductObjectSchema = Yup.object({
     value: Yup.number().min(1).required(),
     label: Yup.string().required(),
   }).nullable(),
-  product_id: Yup.number()
-    .required('Produk wajib diisi!')
-    .min(1, 'Produk wajib diisi!')
-    .typeError('Produk wajib diisi!'),
+  product_id: Yup.number().required('Produk wajib diisi!'),
   product_qty: Yup.number()
     .required('Qty wajib diisi!')
     .min(1, 'Qty minimal 1!')
@@ -133,14 +127,15 @@ const DeliveryObjectSchema: Yup.ObjectSchema<DeliverySchema> = Yup.object({
         (delivery_cost !== undefined && delivery_cost > 0)
       );
     }),
-  document_path: Yup.string().nullable().optional(),
+  document_path: Yup.string().optional(),
   document_index: Yup.number().optional(),
-  document: Yup.mixed<File | MovementDocument>()
+  document: Yup.mixed<File | string>()
     .nullable()
-    .test('fileSize', 'Ukuran dokumen maksimal 5 MB', (value) => {
+    .test('fileSize', 'Ukuran dokumen maksimal 2 MB', (value) => {
       if (!value) return true;
-      if (value instanceof File) return value.size <= 5 * 1024 * 1024;
-      return true;
+      if (typeof value === 'string') return true;
+      if (value instanceof File) return value.size <= 2 * 1024 * 1024;
+      return false;
     }),
   driver_name: Yup.string().required('Nama sopir wajib diisi!'),
   vehicle_plate: Yup.string().required('Plat nomor wajib diisi!'),
@@ -148,10 +143,7 @@ const DeliveryObjectSchema: Yup.ObjectSchema<DeliverySchema> = Yup.object({
     value: Yup.number().min(1).required(),
     label: Yup.string().required(),
   }).nullable(),
-  supplier_id: Yup.number()
-    .required('Supplier wajib diisi!')
-    .min(1, 'Supplier wajib diisi!')
-    .typeError('Supplier wajib diisi!'),
+  supplier_id: Yup.number().required('Supplier wajib diisi!'),
   products: Yup.array()
     .of(DeliveryProductObjectSchema)
     .min(1, 'Minimal harus ada 1 produk!')
@@ -170,7 +162,6 @@ export const MovementFormSchema: Yup.ObjectSchema<MovementFormSchemaType> =
     }).nullable(),
     source_warehouse_id: Yup.number()
       .required('Gudang asal wajib diisi!')
-      .min(1, 'Gudang asal wajib diisi!')
       .typeError('Gudang asal wajib diisi!'),
     destination_warehouse: Yup.object({
       value: Yup.number().min(1).required(),
@@ -180,7 +171,6 @@ export const MovementFormSchema: Yup.ObjectSchema<MovementFormSchemaType> =
     }).nullable(),
     destination_warehouse_id: Yup.number()
       .required('Gudang tujuan wajib diisi!')
-      .min(1, 'Gudang tujuan wajib diisi!')
       .typeError('Gudang tujuan wajib diisi!')
       .test(
         'different-warehouse',
@@ -237,62 +227,41 @@ export const getMovementFormInitialValues = (
         }
       : null,
     destination_warehouse_id: initialValues?.destination_warehouse?.id ?? 0,
-    products: initialValues?.details?.map((detail) => ({
-      product: {
-        value: detail.product.id,
-        label: detail.product.name,
-      },
-      product_id: detail.product.id,
-      product_qty: detail.quantity,
-    })) ?? [
-      {
-        product: null,
-        product_id: 0,
-        product_qty: '',
-      },
-    ],
-    deliveries: initialValues?.deliveries?.map((d) => ({
-      delivery_cost: d.shipping_cost_total ?? undefined,
-      delivery_cost_per_item: d.shipping_cost_item ?? undefined,
-      document: d.document ?? null,
-      document_path: d.document_path ?? null,
-      driver_name: d.driver_name ?? '',
-      vehicle_plate: d.vehicle_plate ?? '',
-      supplier: d.supplier
-        ? { value: d.supplier.id, label: d.supplier.name }
-        : null,
-      supplier_id: d.supplier?.id ?? 0,
-      products:
-        d.items?.map((item) => {
-          const productData = detailIdToProductId.get(
-            item.stock_transfer_detail_id
-          );
-          return {
-            product: productData
-              ? { value: productData.id, label: productData.name }
-              : null,
-            product_id: productData?.id ?? 0,
-            product_qty: item.quantity,
-          };
-        }) ?? [],
-    })) ?? [
-      {
-        delivery_cost: undefined,
-        delivery_cost_per_item: undefined,
-        document: null,
-        document_path: null,
-        driver_name: '',
-        vehicle_plate: '',
-        supplier: null,
-        supplier_id: 0,
-        products: [
-          {
-            product: null,
-            product_id: 0,
-            product_qty: '',
-          },
-        ],
-      },
-    ],
+    products:
+      initialValues?.details?.map((detail) => ({
+        product: {
+          value: detail.product.id,
+          label: detail.product.name,
+        },
+        product_id: detail.product.id,
+        product_qty: detail.quantity,
+      })) ?? [],
+    deliveries:
+      initialValues?.deliveries?.map((d) => ({
+        delivery_cost: d.shipping_cost_total ?? undefined,
+        delivery_cost_per_item: d.shipping_cost_item ?? undefined,
+        document_number: d.document_number ?? '',
+        document: d.document_path ?? null,
+        document_path: d.document_path ?? null,
+        driver_name: d.driver_name ?? '',
+        vehicle_plate: d.vehicle_plate ?? '',
+        supplier: d.supplier
+          ? { value: d.supplier.id, label: d.supplier.name }
+          : null,
+        supplier_id: d.supplier?.id ?? 0,
+        products:
+          d.items?.map((item) => {
+            const productData = detailIdToProductId.get(
+              item.stock_transfer_detail_id
+            );
+            return {
+              product: productData
+                ? { value: productData.id, label: productData.name }
+                : null,
+              product_id: productData?.id ?? 0,
+              product_qty: item.quantity,
+            };
+          }) ?? [],
+      })) ?? [],
   };
 };

src/components/pages/inventory/movement/form/MovementForm.tsx

@@ -35,9 +35,6 @@ import FileInput from '@/components/input/FileInput';
 import CheckboxInput from '@/components/input/CheckboxInput';
 import Badge from '@/components/Badge';
 import Card from '@/components/Card';
-import { S3_PUBLIC_BASE_URL } from '@/config/constant';
-import { getUniqueFormikErrors } from '@/lib/formik-helper';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 
 interface MovementFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -55,12 +52,19 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
   ] = useState('');
   const [selectedProducts, setSelectedProducts] = useState<number[]>([]);
   const [selectedDeliveries, setSelectedDeliveries] = useState<number[]>([]);
-  const [formErrorList, setFormErrorList] = useState<string[]>([]);
 
   // ===== FORM HANDLERS =====
   const createMovementHandler = useCallback(
-    async (payload: CreateMovementPayload) => {
-      const res = await MovementApi.createMovement(payload);
+    async (payload: CreateMovementPayload, documents: File[] = []) => {
+      const formData = new FormData();
+      formData.append('data', JSON.stringify(payload));
+      documents.forEach((file, index) => {
+        formData.append(`documents[${index}]`, file);
+      });
+
+      const res = await MovementApi.create(
+        formData as unknown as CreateMovementPayload
+      );
       if (isResponseError(res)) {
         setMovementFormErrorMessage(res.message);
         return;
@@ -189,45 +193,12 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
         return;
       }
       const documents: File[] = [];
-      const documentNameToIndex = new Map<string, number>();
-      let sequentialDocumentIndex = 0;
-
       const deliveriesPayload = values.deliveries.map((d) => {
-        let documentIndex = -1;
+        let documentIndex = 0;
 
         if (d.document && d.document instanceof File) {
-          const fileName = d.document.name;
-
-          if (documentNameToIndex.has(fileName)) {
-            documentIndex = documentNameToIndex.get(fileName)!;
-          } else {
-            documents.push(d.document);
-            documentIndex = sequentialDocumentIndex;
-            documentNameToIndex.set(fileName, documentIndex);
-            sequentialDocumentIndex++;
-          }
-        } else if (d.document_path) {
-          const pathFileName =
-            d.document_path.split('/').pop() || d.document_path;
-
-          if (documentNameToIndex.has(pathFileName)) {
-            documentIndex = documentNameToIndex.get(pathFileName)!;
-          } else {
-            documentIndex = sequentialDocumentIndex;
-            documentNameToIndex.set(pathFileName, documentIndex);
-            sequentialDocumentIndex++;
-          }
-        } else if (d.document && !(d.document instanceof File)) {
-          const existingDocFileName =
-            d.document.path.split('/').pop() || d.document.path;
-
-          if (documentNameToIndex.has(existingDocFileName)) {
-            documentIndex = documentNameToIndex.get(existingDocFileName)!;
-          } else {
-            documentIndex = sequentialDocumentIndex;
-            documentNameToIndex.set(existingDocFileName, documentIndex);
-            sequentialDocumentIndex++;
-          }
+          documents.push(d.document);
+          documentIndex = documents.length - 1;
         }
 
         return {
@@ -235,6 +206,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
           delivery_cost_per_item:
             parseInt((d.delivery_cost_per_item || '').toString()) || 0,
           document_index: documentIndex,
+          document_path: d.document_path,
           driver_name: d.driver_name,
           vehicle_plate: d.vehicle_plate,
           supplier_id: d.supplier_id,
@@ -246,23 +218,20 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       });
 
       const payload: CreateMovementPayload = {
-        data: {
-          transfer_reason: values.transfer_reason,
-          transfer_date: values.transfer_date,
-          source_warehouse_id: values.source_warehouse_id,
-          destination_warehouse_id: values.destination_warehouse_id,
-          products: values.products.map((p) => ({
-            product_id: p.product_id,
-            product_qty: parseInt(p.product_qty.toString()) || 0,
-          })),
-          deliveries: deliveriesPayload,
-        },
-        documents: documents.length > 0 ? documents : undefined,
+        transfer_reason: values.transfer_reason,
+        transfer_date: values.transfer_date,
+        source_warehouse_id: values.source_warehouse_id,
+        destination_warehouse_id: values.destination_warehouse_id,
+        products: values.products.map((p) => ({
+          product_id: p.product_id,
+          product_qty: parseInt(p.product_qty.toString()) || 0,
+        })),
+        deliveries: deliveriesPayload,
       };
 
       switch (type) {
         case 'add':
-          await createMovementHandler(payload);
+          await createMovementHandler(payload, documents);
           break;
       }
     },
@@ -796,36 +765,8 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       type !== 'edit' &&
       type !== 'detail'
     ) {
-      if (formik.values.products.length === 0) {
-        formik.setFieldValue('products', [
-          {
-            product: null,
-            product_id: 0,
-            product_qty: '',
-          },
-        ]);
-      }
-      if (formik.values.deliveries.length === 0) {
-        formik.setFieldValue('deliveries', [
-          {
-            delivery_cost: undefined,
-            delivery_cost_per_item: undefined,
-            document: null,
-            document_path: null,
-            driver_name: '',
-            vehicle_plate: '',
-            supplier: null,
-            supplier_id: 0,
-            products: [
-              {
-                product: null,
-                product_id: 0,
-                product_qty: '',
-              },
-            ],
-          },
-        ]);
-      }
+      formik.setFieldValue('products', []);
+      formik.setFieldValue('deliveries', []);
     }
   }, [formik.values.source_warehouse_id]);
 
@@ -854,22 +795,6 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
     formik.errors.destination_warehouse_id,
   ]);
 
-  const handleValidateForm = async () => {
-    const errors = await formik.validateForm();
-
-    if (Object.keys(errors).length > 0) {
-      const errorMessages = getUniqueFormikErrors(errors);
-      setFormErrorList(errorMessages);
-      return;
-    }
-  };
-
-  const handleFormSubmit = (e: React.FormEvent<HTMLFormElement>) => {
-    e.preventDefault();
-    handleValidateForm();
-    formik.handleSubmit(e);
-  };
-
   return (
     <>
       <section className='w-full'>
@@ -889,29 +814,10 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
           </h1>
         </header>
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
-          {movementFormErrorMessage && (
-            <div role='alert' className='alert alert-error'>
-              <Icon
-                icon='material-symbols:error-outline'
-                width={24}
-                height={24}
-              />
-              <span>{movementFormErrorMessage}</span>
-            </div>
-          )}
-
-          {/* Error List Alert */}
-          {formErrorList.length > 0 && (
-            <AlertErrorList
-              formErrorList={formErrorList}
-              onClose={() => setFormErrorList([])}
-            />
-          )}
-
           {/* Top card - Movement details */}
           <Card
             title='Detail Movement'
@@ -1195,7 +1101,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                     <th>
                       Produk
                       <span
-                        className='tooltip tooltip-error tooltip-bottom z-9999'
+                        className='tooltip tooltip-error tooltip-bottom z-[9999]'
                         data-tip='required'
                       >
                         <span className='text-error'>*</span>
@@ -1204,7 +1110,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                     <th>
                       Qty
                       <span
-                        className='tooltip tooltip-error tooltip-bottom z-9999'
+                        className='tooltip tooltip-error tooltip-bottom z-[9999]'
                         data-tip='required'
                       >
                         <span className='text-error'>*</span>
@@ -1217,7 +1123,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                   {formik.values.products?.map((product, idx) => (
                     <tr key={`product-row-${idx}-${product.product_id}`}>
                       {type !== 'detail' && (
-                        <td className='align-middle!'>
+                        <td className='!align-middle'>
                           <CheckboxInput
                             name={`product-${idx}`}
                             checked={selectedProducts.includes(idx)}
@@ -1409,7 +1315,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                     <th>
                       Produk
                       <span
-                        className='tooltip tooltip-error tooltip-bottom z-9999'
+                        className='tooltip tooltip-error tooltip-bottom z-[9999]'
                         data-tip='required'
                       >
                         <span className='text-error'>*</span>
@@ -1418,7 +1324,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                     <th>
                       Qty
                       <span
-                        className='tooltip tooltip-error tooltip-bottom z-9999'
+                        className='tooltip tooltip-error tooltip-bottom z-[9999]'
                         data-tip='required'
                       >
                         <span className='text-error'>*</span>
@@ -1427,7 +1333,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                     <th>
                       Supplier
                       <span
-                        className='tooltip tooltip-error tooltip-bottom z-9999'
+                        className='tooltip tooltip-error tooltip-bottom z-[9999]'
                         data-tip='required'
                       >
                         <span className='text-error'>*</span>
@@ -1436,7 +1342,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                     <th>
                       Plat Nomor
                       <span
-                        className='tooltip tooltip-error tooltip-bottom z-9999'
+                        className='tooltip tooltip-error tooltip-bottom z-[9999]'
                         data-tip='required'
                       >
                         <span className='text-error'>*</span>
@@ -1446,7 +1352,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                     <th>
                       Biaya Pengiriman (Rp.)
                       <span
-                        className='tooltip tooltip-error tooltip-bottom z-9999'
+                        className='tooltip tooltip-error tooltip-bottom z-[9999]'
                         data-tip='required'
                       >
                         <span className='text-error'>*</span>
@@ -1455,7 +1361,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                     <th>
                       Biaya Per Item (Rp.)
                       <span
-                        className='tooltip tooltip-error tooltip-bottom z-9999'
+                        className='tooltip tooltip-error tooltip-bottom z-[9999]'
                         data-tip='required'
                       >
                         <span className='text-error'>*</span>
@@ -1464,7 +1370,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                     <th>
                       Nama Sopir
                       <span
-                        className='tooltip tooltip-error tooltip-bottom z-9999'
+                        className='tooltip tooltip-error tooltip-bottom z-[9999]'
                         data-tip='required'
                       >
                         <span className='text-error'>*</span>
@@ -1477,7 +1383,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                   {formik.values.deliveries?.map((delivery, idx) => (
                     <tr key={`delivery-row-${idx}`}>
                       {type !== 'detail' && (
-                        <td className='align-middle!'>
+                        <td className='!align-middle'>
                           <CheckboxInput
                             name={`delivery-${idx}`}
                             checked={selectedDeliveries.includes(idx)}
@@ -1631,64 +1537,37 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                         {type === 'detail' ? (
                           <>
                             <div className='flex flex-col items-start gap-2'>
-                              {delivery.document_path ? (
-                                <Button
-                                  color='primary'
-                                  className='w-full min-w-52 flex items-center justify-center gap-2'
-                                  href={`${S3_PUBLIC_BASE_URL}/${delivery.document_path.startsWith('/') ? delivery.document_path.slice(1) : delivery.document_path}`}
-                                  target='_blank'
-                                  rel='noopener noreferrer'
-                                >
-                                  <Icon
-                                    icon='material-symbols:file-open-outline'
-                                    width={20}
-                                    height={20}
-                                  />
-                                  Lihat Dokumen
-                                </Button>
-                              ) : delivery.document &&
-                                delivery.document instanceof File === false ? (
-                                <Button
-                                  color='primary'
-                                  className='w-full min-w-52 flex items-center justify-center gap-2'
-                                  href={`${S3_PUBLIC_BASE_URL}/${delivery.document.path.startsWith('/') ? delivery.document.path.slice(1) : delivery.document.path}`}
-                                  target='_blank'
-                                  rel='noopener noreferrer'
-                                >
-                                  <Icon
-                                    icon='material-symbols:file-open-outline'
-                                    width={20}
-                                    height={20}
-                                  />
-                                  <span className='truncate max-w-[200px]'>
-                                    {delivery.document.name}
-                                  </span>
-                                </Button>
-                              ) : (
-                                <Button
-                                  color='neutral'
-                                  className='w-full min-w-52 flex items-center justify-center gap-2 cursor-not-allowed'
-                                  disabled
-                                >
-                                  <Icon
-                                    icon='material-symbols:description'
-                                    width={20}
-                                    height={20}
-                                  />
-                                  Tidak ada dokumen
-                                </Button>
-                              )}
+                              <Button
+                                color='primary'
+                                className='w-full min-w-52 flex items-center justify-center gap-2'
+                                disabled={!delivery.document_path}
+                                href={delivery.document_path ?? undefined}
+                                target='_blank'
+                                rel='noopener noreferrer'
+                              >
+                                {delivery.document_path ? (
+                                  <>
+                                    <Icon
+                                      icon='material-symbols:file-open-outline'
+                                      width={20}
+                                      height={20}
+                                    />
+                                    Lihat Dokumen
+                                  </>
+                                ) : (
+                                  '-'
+                                )}
+                              </Button>
                             </div>
                           </>
                         ) : (
                           <FileInput
-                            accept='.pdf,.jpg,.jpeg,.png'
                             name={`deliveries.${idx}.document`}
                             onChange={(e) => {
                               const file = e.target.files?.[0];
                               if (file) {
-                                if (file.size > 5 * 1024 * 1024) {
-                                  toast.error('Ukuran dokumen maksimal 5 MB!');
+                                if (file.size > 2 * 1024 * 1024) {
+                                  toast.error('Ukuran dokumen maksimal 2 MB!');
                                   e.target.value = '';
                                   return;
                                 }
@@ -1845,6 +1724,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                   disabled={
                     hasInvalidQty ||
                     hasExceededStock ||
+                    !formik.isValid ||
                     formik.isSubmitting ||
                     (formik.values.source_warehouse_id ===
                       formik.values.destination_warehouse_id &&
@@ -1857,6 +1737,17 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
               </div>
             )}
           </div>
+
+          {movementFormErrorMessage && (
+            <div role='alert' className='alert alert-error'>
+              <Icon
+                icon='material-symbols:error-outline'
+                width={24}
+                height={24}
+              />
+              <span>{movementFormErrorMessage}</span>
+            </div>
+          )}
         </form>
       </section>
     </>

src/components/pages/marketing/MarketingTable.tsx

@@ -2,10 +2,7 @@
 
 import Button from '@/components/Button';
 import CheckboxInput from '@/components/input/CheckboxInput';
-import SelectInput, {
-  OptionType,
-  useSelect,
-} from '@/components/input/SelectInput';
+import SelectInput, { OptionType } from '@/components/input/SelectInput';
 import Modal, { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
@@ -31,8 +28,6 @@ import toast from 'react-hot-toast';
 import useSWR from 'swr';
 import RequirePermission from '@/components/helper/RequirePermission';
 import { useAuth } from '@/services/hooks/useAuth';
-import { CustomerApi, ProductApi } from '@/services/api/master-data';
-import { MARKETING_APPROVAL_LINE } from '@/config/approval-line';
 
 const RowsOptionsMenu = ({
   type = 'dropdown',
@@ -69,51 +64,47 @@ const RowsOptionsMenu = ({
           </Button>
         </RequirePermission>
         {props.row.original.latest_approval.step_number != 1 && (
-          <>
-            <RequirePermission
-              permissions={
+          <RequirePermission
+            permissions={
+              props.row.original.latest_approval.step_number == 3
+                ? 'lti.marketing.delivery_order.update'
+                : 'lti.marketing.delivery_order.create'
+            }
+          >
+            <Button
+              href={
                 props.row.original.latest_approval.step_number == 3
-                  ? 'lti.marketing.delivery_order.update'
-                  : 'lti.marketing.delivery_order.create'
+                  ? `/marketing/detail/delivery-orders/edit?marketingId=${props.row.original.id}`
+                  : props.row.original.latest_approval.step_number == 2
+                    ? `/marketing/add/delivery-orders?marketingId=${props.row.original.id}`
+                    : undefined
               }
-            >
-              <Button
-                href={
-                  props.row.original.latest_approval.step_number == 3
-                    ? `/marketing/detail/delivery-orders/edit?marketingId=${props.row.original.id}`
-                    : props.row.original.latest_approval.step_number == 2
-                      ? `/marketing/add/delivery-orders?marketingId=${props.row.original.id}`
-                      : undefined
+              onClick={() => {
+                if (props.row.original.latest_approval.step_number == 2) {
+                  deliveryClickHandler?.();
                 }
-                onClick={() => {
-                  if (props.row.original.latest_approval.step_number == 2) {
-                    deliveryClickHandler?.();
-                  }
-                }}
-                variant='ghost'
-                color='success'
-                className='justify-start text-sm'
-              >
-                <Icon icon='mdi:truck' width={16} height={16} />
-                Deliver
-              </Button>
-            </RequirePermission>
-          </>
+              }}
+              variant='ghost'
+              color='success'
+              className='justify-start text-sm'
+            >
+              <Icon icon='mdi:truck' width={16} height={16} />
+              Deliver
+            </Button>
+          </RequirePermission>
         )}
         {props.row.original.latest_approval.step_number != 3 && (
-          <>
-            <RequirePermission permissions='lti.marketing.sales_order.update'>
-              <Button
-                href={`/marketing/detail/sales-orders/edit?marketingId=${props.row.original.id}`}
-                variant='ghost'
-                color='warning'
-                className='justify-start text-sm'
-              >
-                <Icon icon='mdi:pencil-outline' width={16} height={16} />
-                Edit
-              </Button>
-            </RequirePermission>
-          </>
+          <RequirePermission permissions='lti.marketing.sales_order.update'>
+            <Button
+              href={`/marketing/detail/sales-orders/edit?marketingId=${props.row.original.id}`}
+              variant='ghost'
+              color='warning'
+              className='justify-start text-sm'
+            >
+              <Icon icon='mdi:pencil-outline' width={16} height={16} />
+              Edit
+            </Button>
+          </RequirePermission>
         )}
         <RequirePermission permissions='lti.marketing.sales_order.delete'>
           <Button
@@ -133,6 +124,8 @@ const RowsOptionsMenu = ({
 
 const MarketingTable = () => {
   const [search, setSearch] = useState('');
+  const [page, setPage] = useState(1);
+  const [pageSize, setPageSize] = useState(10);
 
   const [approveAction, setApproveAction] = useState<'APPROVED' | 'REJECTED'>(
     'APPROVED'
@@ -142,68 +135,22 @@ const MarketingTable = () => {
   const { permissionCheck } = useAuth();
 
   const router = useRouter();
-  const deleteModal = useModal();
-  const confirmationModal = useModal();
-  const productsModal = useModal();
-  const deliveryModal = useModal();
-  const {
-    state: tableFilterState,
-    updateFilter,
-    setPage,
-    setPageSize,
-    toQueryString: getTableFilterToQueryString,
-  } = useTableFilter({
-    initial: {
-      search: '',
-      product_ids: '',
-      status: '',
-      customer_id: '',
-      page: 1,
-      limit: 10,
-    },
-    paramMap: {
-      page: 'page',
-      pageSize: 'limit',
-      product_ids: 'product_ids',
-      status: 'status',
-      customer_id: 'customer_id',
-    },
-  });
 
-  // ===== FETCH DATA =====
   const {
     data: marketing,
     isLoading: isLoadingMarketing,
     mutate: refreshMarketing,
-  } = useSWR(
-    `${MarketingApi.basePath}${getTableFilterToQueryString()}`,
-    MarketingApi.getAllFetcher
-  );
+  } = useSWR(MarketingApi.basePath, MarketingApi.getAllFetcher);
 
-  // ===== OPTIONS =====
-  const {
-    options: productsOptions,
-    isLoadingOptions: isLoadingProductsOptions,
-  } = useSelect(ProductApi.basePath, 'id', 'name', '', {
-    limit: 'limit',
-  });
-  const {
-    options: customersOptions,
-    isLoadingOptions: isLoadingCustomersOptions,
-  } = useSelect(CustomerApi.basePath, 'id', 'name', '', {
-    limit: 'limit',
-  });
-  const statusOptions = MARKETING_APPROVAL_LINE.map((item) => ({
-    value: item.step_number,
-    label: item.step_name,
-  }));
+  const deleteModal = useModal();
+  const confirmationModal = useModal();
+  const productsModal = useModal();
+  const deliveryModal = useModal();
 
-  // ===== HANDLER =====
   const searchChangeHandler = useCallback(
     (e: React.ChangeEvent<HTMLInputElement>) => {
       setSearch(e.target.value);
-      updateFilter('page', 1);
-      updateFilter('search', e.target.value);
+      setPage(1);
     },
     []
   );
@@ -211,8 +158,7 @@ const MarketingTable = () => {
     (val: OptionType | OptionType[] | null) => {
       const newVal = val as OptionType;
       setPageSize(newVal.value as number);
-      updateFilter('page', 1);
-      updateFilter('limit', newVal.value as number);
+      setPage(1);
     },
     []
   );
@@ -317,6 +263,20 @@ const MarketingTable = () => {
     );
   };
 
+  const {
+    state: tableFilterState,
+    updateFilter,
+    toQueryString: getTableFilterToQueryString,
+  } = useTableFilter({
+    initial: {
+      search: '',
+    },
+    paramMap: {
+      page: 'page',
+      pageSize: 'limit',
+    },
+  });
+
   const getRowCanSelect = (row: Row<Marketing>): boolean => {
     const approval = row.original.latest_approval;
     return approval?.step_number === 1 && approval?.action !== 'REJECTED';
@@ -367,7 +327,7 @@ const MarketingTable = () => {
             </RequirePermission>
           </div>
           <TableRowSizeSelector
-            value={tableFilterState.pageSize}
+            value={pageSize}
             onChange={pageSizeChangeHandler}
             options={ROWS_OPTIONS}
             className='flex sm:flex-row flex-col gap-3 items-end justify-end'
@@ -377,29 +337,7 @@ const MarketingTable = () => {
               label='Product'
               isClearable
               placeholder='Pilih product'
-              options={productsOptions}
-              isLoading={isLoadingProductsOptions}
-              value={
-                tableFilterState.product_ids
-                  ?.split(',')
-                  .map((id) =>
-                    productsOptions.find(
-                      (option) => option.value === Number(id)
-                    )
-                  )
-                  .filter(
-                    (option): option is { value: number; label: string } =>
-                      option !== undefined
-                  ) ?? null
-              }
-              onChange={(value: OptionType | OptionType[] | null) =>
-                updateFilter(
-                  'product_ids',
-                  (value as OptionType[])
-                    ?.map((item: OptionType) => item.value.toString())
-                    .join(',') || ''
-                )
-              }
+              options={[]}
               isMulti
             />
             {/* select status */}
@@ -407,43 +345,14 @@ const MarketingTable = () => {
               label='Status'
               isClearable
               placeholder='Pilih status'
-              options={statusOptions}
-              value={
-                tableFilterState.status
-                  ? statusOptions.find(
-                      (option) =>
-                        option.value === Number(tableFilterState.status)
-                    )
-                  : null
-              }
-              onChange={(value: OptionType | OptionType[] | null) =>
-                updateFilter(
-                  'status',
-                  (value as OptionType)?.value.toString() || ''
-                )
-              }
+              options={[]}
             />
             {/* select customer */}
             <SelectInput
               label='Customer'
               isClearable
               placeholder='Pilih customer'
-              options={customersOptions}
-              isLoading={isLoadingCustomersOptions}
-              value={
-                tableFilterState.customer_id
-                  ? customersOptions.find(
-                      (option) =>
-                        option.value === Number(tableFilterState.customer_id)
-                    )
-                  : null
-              }
-              onChange={(value: OptionType | OptionType[] | null) =>
-                updateFilter(
-                  'customer_id',
-                  (value as OptionType)?.value.toString() || ''
-                )
-              }
+              options={[]}
             />
           </TableRowSizeSelector>
         </div>
@@ -609,8 +518,8 @@ const MarketingTable = () => {
               },
             },
           ]}
-          pageSize={tableFilterState.pageSize}
-          page={tableFilterState.page}
+          pageSize={pageSize}
+          page={page}
           onPageChange={setPage}
           className={{
             tableWrapperClassName: 'overflow-x-auto min-h-full!',
@@ -682,7 +591,7 @@ const MarketingTable = () => {
       <Modal
         ref={productsModal.ref}
         className={{
-          modalBox: 'xs:max-w-2/5 z-100',
+          modalBox: 'max-w-2/5 z-100',
         }}
         closeOnBackdrop
       >
@@ -724,7 +633,6 @@ const MarketingTable = () => {
             },
           ]}
           className={{
-            containerClassName: 'p-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',
@@ -735,7 +643,6 @@ const MarketingTable = () => {
               'px-6 py-3 last:flex last:flex-row last:justify-end',
             paginationClassName: 'hidden',
           }}
-          isLoading={isLoadingMarketing}
         />
       </Modal>
     </>

src/components/pages/marketing/detail/MarketingDetail.tsx

@@ -77,6 +77,10 @@ const MarketingDetail = ({
     confirmationModal.openModal();
   };
 
+  const deliveryClickHandler = () => {
+    deliveryModal.openModal();
+  };
+
   const deleteClickHandler = () => {
     deleteModal.openModal();
   };
@@ -124,10 +128,7 @@ const MarketingDetail = ({
   return (
     <>
       <div className='flex flex-col w-full gap-4'>
-        <FormHeader
-          title={`Detail ${Number(initialValues?.latest_approval?.step_number) > 2 ? 'Delivery Order' : 'Sales Order'}`}
-          backUrl='/marketing'
-        />
+        <FormHeader title='Detail Sales Order' backUrl='/marketing' />
         {!isLoadingApproval && approvals && (
           <ApprovalSteps approvals={approvals} />
         )}
@@ -164,30 +165,28 @@ const MarketingDetail = ({
             </>
           )}
           {initialValues?.latest_approval?.step_number != 1 && (
-            <>
-              <RequirePermission
-                permissions={
+            <RequirePermission
+              permissions={
+                initialValues?.latest_approval?.step_number == 3
+                  ? 'lti.marketing.delivery_order.update'
+                  : 'lti.marketing.delivery_order.create'
+              }
+            >
+              <Button
+                color='success'
+                href={
                   initialValues?.latest_approval?.step_number == 3
-                    ? 'lti.marketing.delivery_order.update'
-                    : 'lti.marketing.delivery_order.create'
+                    ? `/marketing/detail/delivery-orders/edit?marketingId=${initialValues?.id}`
+                    : `/marketing/add/delivery-orders?marketingId=${initialValues?.id}`
                 }
               >
-                <Button
-                  color='success'
-                  href={
-                    initialValues?.latest_approval?.step_number == 3
-                      ? `/marketing/detail/delivery-orders/edit?marketingId=${initialValues?.id}`
-                      : `/marketing/add/delivery-orders?marketingId=${initialValues?.id}`
-                  }
-                >
-                  <Icon icon='mdi:truck' width={24} height={24} />
-                  {initialValues?.latest_approval?.step_number == 3
-                    ? 'Edit '
-                    : 'Tambah '}
-                  Delivery Order
-                </Button>
-              </RequirePermission>
-            </>
+                <Icon icon='mdi:truck' width={24} height={24} />
+                {initialValues?.latest_approval?.step_number == 3
+                  ? 'Edit '
+                  : 'Tambah '}
+                Delivery Order
+              </Button>
+            </RequirePermission>
           )}
         </div>
 
@@ -205,23 +204,8 @@ const MarketingDetail = ({
                     No. Sales Order
                   </td>
                   <td>:</td>
-                  <td width='50%' className='font-mono'>
-                    {initialValues?.so_number}
-                  </td>
+                  <td width='50%'>{initialValues?.so_number}</td>
                 </tr>
-                {Number(initialValues?.latest_approval?.step_number) > 2 && (
-                  <tr>
-                    <td width='45%' className='font-semibold'>
-                      No. Delivery Order
-                    </td>
-                    <td>:</td>
-                    <td width='50%' className='font-mono'>
-                      {initialValues?.delivery_order
-                        ?.map((item) => item.do_number)
-                        .join(', ')}
-                    </td>
-                  </tr>
-                )}
                 <tr>
                   <td className='font-semibold'>Nama Pelanggan</td>
                   <td>:</td>
@@ -248,27 +232,12 @@ const MarketingDetail = ({
                   <td>{initialValues?.notes ?? '-'}</td>
                 </tr>
                 <tr>
-                  <td className='font-semibold'>Dokumen Penjualan</td>
+                  <td className='font-semibold'>Dokumen</td>
                   <td>:</td>
                   <td>
                     <SalesOrderExport data={initialValues} />
                   </td>
                 </tr>
-                {Number(initialValues?.latest_approval?.step_number) > 2 && (
-                  <tr>
-                    <td className='font-semibold'>Dokumen Pengiriman</td>
-                    <td>:</td>
-                    <td className='flex flex-wrap gap-2'>
-                      {initialValues?.delivery_order?.map((item, index) => (
-                        <DeliveryOrderExport
-                          key={index}
-                          data={initialValues}
-                          deliveryOrder={item}
-                        />
-                      ))}
-                    </td>
-                  </tr>
-                )}
               </tbody>
             </table>
           </div>
@@ -458,18 +427,16 @@ const MarketingDetail = ({
         )}
         <div className='flex flex-row gap-3'>
           {initialValues?.latest_approval?.step_number != 3 && (
-            <>
-              <RequirePermission permissions='lti.marketing.sales_order.update'>
-                <Button
-                  color='warning'
-                  type='button'
-                  href={`/marketing/detail/${initialValues?.latest_approval?.step_number == 3 ? 'delivery-orders' : 'sales-orders'}/edit?marketingId=${initialValues?.id}`}
-                >
-                  <Icon icon='mdi:pencil' width={24} height={24} />
-                  Edit
-                </Button>
-              </RequirePermission>
-            </>
+            <RequirePermission permissions='lti.marketing.sales_order.update'>
+              <Button
+                color='warning'
+                type='button'
+                href={`/marketing/detail/${initialValues?.latest_approval.step_number == 3 ? 'delivery-orders' : 'sales-orders'}/edit?marketingId=${initialValues?.id}`}
+              >
+                <Icon icon='mdi:pencil' width={24} height={24} />
+                Edit
+              </Button>
+            </RequirePermission>
           )}
           <RequirePermission permissions='lti.marketing.sales_order.delete'>
             <Button color='error' onClick={deleteClickHandler}>

src/components/pages/marketing/form/MarketingForm.tsx

@@ -48,8 +48,6 @@ import DeliveryOrderProductForm from '@/components/pages/marketing/form/repeater
 import { SalesOrderProductFormValues } from '@/components/pages/marketing/form/repeater/sales-order/SalesOrderProduct.schema';
 import { DeliveryOrderProductFormValues } from '@/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.schema';
 import RequirePermission from '@/components/helper/RequirePermission';
-import AlertErrorList from '@/components/helper/form/FormErrors';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 
 const MemoizedSalesOrderProductTable = memo(SalesOrderProductTable);
 const MemoizedSalesOrderProductForm = memo(SalesOrderProductForm);
@@ -560,14 +558,11 @@ const MarketingForm = ({
     );
   }, [memoSalesOrder]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <form
         className='flex flex-col gap-4'
-        onSubmit={handleFormSubmit}
+        onSubmit={formik.handleSubmit}
         onReset={formik.handleReset}
       >
         <FormHeader
@@ -640,6 +635,12 @@ const MarketingForm = ({
                 wrapper: 'bg-white w-full',
               }}
             >
+              {/* <div className='text-blue-500'>
+                {JSON.stringify(formik.values)}
+              </div>
+              <div className='text-red-500'>
+                {JSON.stringify(formik.errors)}
+              </div> */}
               <MemoizedDeliveryOrderProductTable
                 formType={formType}
                 data={deliveryOrderValues}
@@ -671,8 +672,6 @@ const MarketingForm = ({
           </div>
         </div>
 
-        <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
         {/* Form Actions */}
         <div className='flex flex-row items-start justify-center gap-2 mt-4'>
           <Button type='reset' color='warning' disabled={formik.isSubmitting}>
@@ -680,7 +679,7 @@ const MarketingForm = ({
           </Button>
           <Button
             type='submit'
-            disabled={formik.isSubmitting}
+            disabled={!formik.isValid || formik.isSubmitting}
             isLoading={formik.isSubmitting}
           >
             Submit

src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx

@@ -15,9 +15,6 @@ import { BaseSalesOrder } from '@/types/api/marketing/marketing';
 import Badge from '@/components/Badge';
 import { SalesProductToFieldValues } from '@/components/pages/marketing/form/MarketingForm';
 import * as Yup from 'yup';
-import { isResponseSuccess } from '@/lib/api-helper';
-import AlertErrorList from '@/components/helper/form/FormErrors';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 
 const DeliveryOrderProductForm = ({
   formState,
@@ -42,7 +39,6 @@ const DeliveryOrderProductForm = ({
     null
   );
   const [currentInput, setCurrentInput] = useState<string>('');
-
   const salesOrder = salesOrders.find(
     (item) => item.id === initialValues?.marketing_product_id
   );
@@ -167,14 +163,15 @@ const DeliveryOrderProductForm = ({
     }
   }, [initialValues]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <form
         className='size-full'
-        onSubmit={handleFormSubmit}
+        onSubmit={(e) => {
+          e.preventDefault();
+          handleBlurField(currentInput);
+          formik.handleSubmit(e);
+        }}
         onReset={handleResetForm}
       >
         {formikErrorMessage && (
@@ -211,7 +208,7 @@ const DeliveryOrderProductForm = ({
                   ...formik.values,
                   marketing_product_id: undefined,
                   marketing_product: null,
-                  qty: '',
+                  qty: formik.values.qty || '',
                   unit_price: '',
                   total_price: '',
                   avg_weight: '',
@@ -225,7 +222,7 @@ const DeliveryOrderProductForm = ({
                 ...formik.values,
                 marketing_product_id: selected.value as number,
                 marketing_product: SalesProductToFieldValues(so),
-                qty: so.qty,
+                qty: formik.values.qty || so.qty,
                 unit_price: so.unit_price,
                 total_price: so.total_price,
                 avg_weight: so.avg_weight,
@@ -301,18 +298,8 @@ const DeliveryOrderProductForm = ({
             isError={Boolean(formik.errors.qty)}
             errorMessage={formik.errors.qty}
             placeholder='Masukan Kuantitas'
-            bottomLabel={
-              formik.values.marketing_product_id
-                ? 'Stok dijual: ' +
-                  salesOrders?.find(
-                    (item) => item.id === formik.values.marketing_product_id
-                  )?.qty
-                : ''
-            }
           />
-        </div>
-        <div className='divider my-6'></div>
-        <div className='grid sm:grid-cols-2 gap-4'>
+
           <NumberInput
             required
             label='Avg. Bobot (Kg)'
@@ -374,8 +361,6 @@ const DeliveryOrderProductForm = ({
           />
         </div>
 
-        <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
         <div className='flex flex-row justify-end gap-3 mt-4'>
           <Button type='reset' color='warning'>
             Reset
@@ -383,7 +368,7 @@ const DeliveryOrderProductForm = ({
           <Button
             type='submit'
             isLoading={formik.isSubmitting}
-            disabled={formik.isSubmitting}
+            disabled={!formik.isValid || formik.isSubmitting}
           >
             Submit
           </Button>

src/components/pages/marketing/form/repeater/sales-order/SalesOrderProduct.schema.ts

@@ -25,19 +25,15 @@ export const SalesOrderProductSchema: Yup.ObjectSchema<SalesOrderProductSchemaTy
     id: Yup.number(),
     vehicle_number: Yup.string().required('Nomor Kendaraan wajib diisi!'),
     kandang: Yup.object({
-      value: Yup.number()
-        .min(1, 'Kandang wajib diisi!')
-        .required('Kandang wajib diisi!'),
-      label: Yup.string().required('Kandang wajib diisi!'),
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
     }).nullable(),
     kandang_id: Yup.number()
       .min(1, 'Kandang wajib diisi!')
       .required('Kandang wajib diisi!'),
     product_warehouse: Yup.object({
-      value: Yup.number()
-        .min(1, 'Produk wajib diisi!')
-        .required('Produk wajib diisi!'),
-      label: Yup.string().required('Produk wajib diisi!'),
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
     }).nullable(),
     product_warehouse_id: Yup.number()
       .min(1, 'Produk wajib diisi!')

src/components/pages/marketing/form/repeater/sales-order/SalesOrderProductForm.tsx

@@ -11,21 +11,15 @@ import SelectInput, {
   useSelect,
 } from '@/components/input/SelectInput';
 import { Kandang } from '@/types/api/master-data/kandang';
-import { WarehouseApi } from '@/services/api/master-data';
+import { KandangApi, WarehouseApi } from '@/services/api/master-data';
 import { ProductWarehouse } from '@/types/api/inventory/product-warehouse';
 import { ProductWarehouseApi } from '@/services/api/inventory';
 import NumberInput from '@/components/input/NumberInput';
 import Button from '@/components/Button';
 import { isResponseSuccess } from '@/lib/api-helper';
-import {
-  formatCurrency,
-  formatNumber,
-  formatVechicleNumber,
-} from '@/lib/helper';
+import { formatVechicleNumber } from '@/lib/helper';
 import PatternInput from '@/components/input/PatternInput';
 import Alert from '@/components/Alert';
-import AlertErrorList from '@/components/helper/form/FormErrors';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 
 const SalesOrderProductForm = ({
   initialValues,
@@ -40,7 +34,6 @@ const SalesOrderProductForm = ({
   const [formErrorMessage, setFormErrorMessage] = useState('');
   const [currentInput, setCurrentInput] = useState<string>('');
 
-  // ============ Formik ============
   const formik = useFormik<SalesOrderProductFormValues>({
     enableReinitialize: true,
     initialValues: {
@@ -65,7 +58,6 @@ const SalesOrderProductForm = ({
     isInitialValid: false,
   });
 
-  // ===== Options =====
   const {
     options: kandangSourceOptions,
     isLoadingOptions: isLoadingKandangSourceOptions,
@@ -94,13 +86,12 @@ const SalesOrderProductForm = ({
     );
   }, [warehouseSourceOptions, exisitingValues]);
 
-  // ===== Handler =====
   const kandangChangeHandler = (val: OptionType | OptionType[] | null) => {
     formik.setFieldValue('kandang', val as OptionType);
     formik.setFieldValue('kandang_id', (val as OptionType)?.value);
     formik.setFieldValue('product_warehouse_id', null);
     formik.setFieldValue('product_warehouse', null);
-    formik.setFieldValue('qty', '');
+    formik.setFieldValue('qty', null);
   };
 
   const warehouseChangeHandler = (val: OptionType | OptionType[] | null) => {
@@ -115,7 +106,7 @@ const SalesOrderProductForm = ({
       formik.setFieldValue('qty', productWarehouse?.quantity);
       handleBlurField('qty');
     } else {
-      formik.setFieldValue('qty', '');
+      formik.setFieldValue('qty', null);
     }
   };
 
@@ -171,14 +162,15 @@ const SalesOrderProductForm = ({
     }
   };
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <form
         className='size-full'
-        onSubmit={handleFormSubmit}
+        onSubmit={(e) => {
+          e.preventDefault();
+          handleBlurField(currentInput);
+          formik.handleSubmit(e);
+        }}
         onReset={handleResetForm}
       >
         {formErrorMessage && (
@@ -188,6 +180,9 @@ const SalesOrderProductForm = ({
             </Alert>
           </div>
         )}
+        {/* <small className='block text-rose-500'>
+          {JSON.stringify(formik.errors)}
+        </small> */}
         <div className='grid sm:grid-cols-2 gap-4 z-200'>
           <PatternInput
             name='vehicle_number'
@@ -256,24 +251,7 @@ const SalesOrderProductForm = ({
             isError={formik.touched.qty && Boolean(formik.errors.qty)}
             errorMessage={formik.errors.qty}
             placeholder='Masukan Kuantitas'
-            bottomLabel={
-              isResponseSuccess(warehouseSourceRawData) &&
-              formik.values.product_warehouse_id
-                ? `Stok tersedia: ${formatNumber(
-                    warehouseSourceRawData?.data?.find(
-                      (item) => item.id === formik.values.product_warehouse_id
-                    )?.quantity ?? 0
-                  )} ${
-                    warehouseSourceRawData?.data?.find(
-                      (item) => item.id === formik.values.product_warehouse_id
-                    )?.product?.uom?.name ?? ''
-                  }`
-                : ''
-            }
           />
-        </div>
-        <div className='divider my-6'></div>
-        <div className='grid sm:grid-cols-2 gap-4 z-200'>
           <NumberInput
             required
             label='Avg. Bobot (Kg)'
@@ -339,9 +317,6 @@ const SalesOrderProductForm = ({
             placeholder='Masukan Total Penjualan'
           />
         </div>
-
-        <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
         <div className='flex flex-row justify-end gap-3 mt-4'>
           <Button type='reset' color='warning' onClick={handleResetForm}>
             Reset
@@ -349,7 +324,7 @@ const SalesOrderProductForm = ({
           <Button
             type='submit'
             isLoading={formik.isSubmitting}
-            disabled={formik.isSubmitting}
+            disabled={!formik.isValid || formik.isSubmitting}
           >
             Submit
           </Button>

src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx

@@ -32,6 +32,38 @@ const DeliveryOrderProductTable = ({
 
   const columns = useMemo(() => {
     const cols = [
+      // {
+      //   id: 'select',
+      //   header: ({
+      //     table,
+      //   }: {
+      //     table: TanStack.Table<DeliveryOrderProductFormValues>;
+      //   }) => (
+      //     <div className='w-full flex flex-row justify-center'>
+      //       <CheckboxInput
+      //         name='allRow'
+      //         checked={table.getIsAllRowsSelected()}
+      //         indeterminate={table.getIsSomeRowsSelected()}
+      //         onChange={table.getToggleAllRowsSelectedHandler()}
+      //       />
+      //     </div>
+      //   ),
+      //   cell: ({
+      //     row,
+      //   }: {
+      //     row: TanStack.Row<DeliveryOrderProductFormValues>;
+      //   }) => (
+      //     <div>
+      //       <CheckboxInput
+      //         name='row'
+      //         checked={row.getIsSelected()}
+      //         disabled={!row.getCanSelect()}
+      //         indeterminate={row.getIsSomeSelected()}
+      //         onChange={row.getToggleSelectedHandler()}
+      //       />
+      //     </div>
+      //   ),
+      // },
       {
         accessorFn: (row: DeliveryOrderProductFormValues) => row.do_number,
         header: 'No. Pengiriman',
@@ -156,6 +188,18 @@ const DeliveryOrderProductTable = ({
                 </Button>
               )}
               {!props.row.original.qty && '-'}
+              {/* {formType == 'add_deliver' && (
+                <Button
+                  color='error'
+                  className='p-1'
+                  onClick={() =>
+                    onDeleteRef.current(props.row.original.id as number)
+                  }
+                  type='button'
+                >
+                  <Icon icon='mdi:trash' width={16} height={16} />
+                </Button>
+              )} */}
             </>
           </div>
         ),
@@ -204,6 +248,22 @@ const DeliveryOrderProductTable = ({
           <Icon icon='mdi:plus' width={16} height={16} />
           Tambah Pengiriman
         </Button>
+        {/* {selectedRowIds.length > 0 && (
+          <Button
+            type='button'
+            variant='outline'
+            color='error'
+            className='justify-start w-fit py-1 text-sm'
+            onClick={onBulkDelete}
+          >
+            <Icon icon='mdi:trash' width={16} height={16} />
+            Hapus
+            {selectedRowIds.length > 0
+              ? ` (${selectedRowIds.length})`
+              : ''}{' '}
+            Pengiriman
+          </Button>
+        )} */}
       </div>
     </>
   );

src/components/pages/master-data/area/form/AreaForm.tsx

@@ -25,8 +25,6 @@ import {
 } from '@/types/api/master-data/area';
 import { AreaApi } from '@/services/api/master-data';
 import { cn } from '@/lib/helper';
-import AlertErrorList from '@/components/helper/form/FormErrors';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 
 interface AreaFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -120,9 +118,6 @@ const AreaForm = ({ type = 'add', initialValues }: AreaFormProps) => {
     formikSetValues(formikInitialValues);
   }, [formikSetValues, formikInitialValues]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <section className='w-full max-w-xl'>
@@ -144,7 +139,7 @@ const AreaForm = ({ type = 'add', initialValues }: AreaFormProps) => {
         </header>
 
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
@@ -204,8 +199,6 @@ const AreaForm = ({ type = 'add', initialValues }: AreaFormProps) => {
               </div>
             )}
 
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
             {type !== 'detail' && (
               <div
                 className={cn('flex flex-row justify-end gap-2', {
@@ -220,7 +213,7 @@ const AreaForm = ({ type = 'add', initialValues }: AreaFormProps) => {
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit

src/components/pages/master-data/bank/form/BankForm.tsx

@@ -25,8 +25,6 @@ import {
 } from '@/types/api/master-data/bank';
 import { BankApi } from '@/services/api/master-data';
 import { cn } from '@/lib/helper';
-import AlertErrorList from '@/components/helper/form/FormErrors';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 
 interface BankFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -126,9 +124,6 @@ const BankForm = ({ type = 'add', initialValues }: BankFormProps) => {
     formikSetValues(formikInitialValues);
   }, [formikSetValues, formikInitialValues]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <section className='w-full max-w-xl'>
@@ -150,7 +145,7 @@ const BankForm = ({ type = 'add', initialValues }: BankFormProps) => {
         </header>
 
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
@@ -252,8 +247,6 @@ const BankForm = ({ type = 'add', initialValues }: BankFormProps) => {
               </div>
             )}
 
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
             {type !== 'detail' && (
               <div
                 className={cn('flex flex-row justify-end gap-2', {
@@ -268,7 +261,7 @@ const BankForm = ({ type = 'add', initialValues }: BankFormProps) => {
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit

src/components/pages/master-data/customer/form/CustomerForm.tsx

@@ -28,8 +28,6 @@ import useSWR from 'swr';
 import { UserApi } from '@/services/api/user';
 import { TYPE_OPTIONS } from '@/config/constant';
 import RequirePermission from '@/components/helper/RequirePermission';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 
 interface CustomerFormProps {
   formType?: 'add' | 'edit' | 'detail';
@@ -193,9 +191,6 @@ const CustomerForm = ({
     formikSetValues(formikInitialValues);
   }, [formikSetValues, formikInitialValues]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   // Render
   return (
     <>
@@ -218,7 +213,7 @@ const CustomerForm = ({
         </header>
 
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
@@ -363,8 +358,6 @@ const CustomerForm = ({
               </div>
             )}
 
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
             {formType !== 'detail' && (
               <div
                 className={cn('flex flex-row justify-end gap-2', {
@@ -379,7 +372,7 @@ const CustomerForm = ({
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit

src/components/pages/master-data/fcr/form/FcrForm.tsx

@@ -26,8 +26,6 @@ import {
 } from '@/types/api/master-data/fcr';
 import { FcrApi } from '@/services/api/master-data';
 import { cn } from '@/lib/helper';
-import AlertErrorList from '@/components/helper/form/FormErrors';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 
 interface FcrFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -160,9 +158,6 @@ const FcrForm = ({ type = 'add', initialValues }: FcrFormProps) => {
     formikSetValues(formikInitialValues);
   }, [formikSetValues, formikInitialValues]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <section className='w-full max-w-5xl'>
@@ -184,7 +179,7 @@ const FcrForm = ({ type = 'add', initialValues }: FcrFormProps) => {
         </header>
 
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
@@ -299,8 +294,6 @@ const FcrForm = ({ type = 'add', initialValues }: FcrFormProps) => {
             )}
           </div>
 
-          <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
           <div className='flex flex-row justify-between gap-2 flex-wrap'>
             {type !== 'add' && (
               <div className='flex flex-row justify-start gap-2'>
@@ -356,7 +349,7 @@ const FcrForm = ({ type = 'add', initialValues }: FcrFormProps) => {
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit

src/components/pages/master-data/flock/form/FlockForm.tsx

@@ -17,8 +17,6 @@ import TextInput from '@/components/input/TextInput';
 import { cn } from '@/lib/helper';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import RequirePermission from '@/components/helper/RequirePermission';
-import AlertErrorList from '@/components/helper/form/FormErrors';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 
 interface FlockCustomProps {
   formType?: 'add' | 'edit' | 'detail';
@@ -88,9 +86,6 @@ const FlockForm = ({ formType = 'add', initialValues }: FlockCustomProps) => {
     formikSetValues(formikInitialValue);
   }, [formikSetValues, formikInitialValue]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   // Render
   return (
     <>
@@ -112,7 +107,7 @@ const FlockForm = ({ formType = 'add', initialValues }: FlockCustomProps) => {
           </h1>
         </header>
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
@@ -173,8 +168,6 @@ const FlockForm = ({ formType = 'add', initialValues }: FlockCustomProps) => {
               </div>
             )}
 
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
             {formType !== 'detail' && (
               <div
                 className={cn('flex flex-row justify-end gap-2', {
@@ -189,7 +182,7 @@ const FlockForm = ({ formType = 'add', initialValues }: FlockCustomProps) => {
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit

src/components/pages/master-data/kandang/form/KandangForm.tsx

@@ -29,8 +29,6 @@ import { LocationApi, KandangApi } from '@/services/api/master-data';
 import { cn } from '@/lib/helper';
 import { UserApi } from '@/services/api/user';
 import NumberInput from '@/components/input/NumberInput';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 
 interface KandangFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -200,9 +198,6 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
     formikSetValues(formikInitialValues);
   }, [formikSetValues, formikInitialValues]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <section className='w-full max-w-xl'>
@@ -224,7 +219,7 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
         </header>
 
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
@@ -329,8 +324,6 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
               </div>
             )}
 
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
             {type !== 'detail' && (
               <div
                 className={cn('flex flex-row justify-end gap-2', {
@@ -345,7 +338,7 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit

src/components/pages/master-data/location/form/LocationForm.tsx

@@ -27,8 +27,6 @@ import {
 } from '@/types/api/master-data/location';
 import { AreaApi, LocationApi } from '@/services/api/master-data';
 import { cn } from '@/lib/helper';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 
 interface LocationFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -162,9 +160,6 @@ const LocationForm = ({ type = 'add', initialValues }: LocationFormProps) => {
     formikSetValues(formikInitialValues);
   }, [formikSetValues, formikInitialValues]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <section className='w-full max-w-xl'>
@@ -186,7 +181,7 @@ const LocationForm = ({ type = 'add', initialValues }: LocationFormProps) => {
         </header>
 
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
@@ -273,8 +268,6 @@ const LocationForm = ({ type = 'add', initialValues }: LocationFormProps) => {
               </div>
             )}
 
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
             {type !== 'detail' && (
               <div
                 className={cn('flex flex-row justify-end gap-2', {
@@ -289,7 +282,7 @@ const LocationForm = ({ type = 'add', initialValues }: LocationFormProps) => {
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit

src/components/pages/master-data/nonstock/form/NonstockForm.tsx

@@ -29,8 +29,6 @@ import { NonstockApi, SupplierApi, UomApi } from '@/services/api/master-data';
 import { cn } from '@/lib/helper';
 import { flags } from '@/types/api/api-general';
 import { SUPPLIER_FLAG_OPTIONS } from '@/config/constant';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 
 interface NonstockFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -215,9 +213,6 @@ const NonstockForm = ({ type = 'add', initialValues }: NonstockFormProps) => {
     formikSetValues(formikInitialValues);
   }, [formikSetValues, formikInitialValues]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <section className='w-full max-w-xl'>
@@ -239,7 +234,7 @@ const NonstockForm = ({ type = 'add', initialValues }: NonstockFormProps) => {
         </header>
 
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
@@ -342,8 +337,6 @@ const NonstockForm = ({ type = 'add', initialValues }: NonstockFormProps) => {
               </div>
             )}
 
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
             {type !== 'detail' && (
               <div
                 className={cn('flex flex-row justify-end gap-2', {
@@ -358,7 +351,7 @@ const NonstockForm = ({ type = 'add', initialValues }: NonstockFormProps) => {
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit

src/components/pages/master-data/product-category/form/ProductCategoryForm.tsx

@@ -11,7 +11,6 @@ import TextInput from '@/components/input/TextInput';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import RequirePermission from '@/components/helper/RequirePermission';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 
 import {
   ProductCategoryFormSchema,
@@ -26,7 +25,6 @@ import {
 } from '@/types/api/master-data/product-category';
 import { ProductCategoryApi } from '@/services/api/master-data';
 import { cn } from '@/lib/helper';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 
 interface ProductCategoryFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -131,9 +129,6 @@ const ProductCategoryForm = ({
     formikSetValues(formikInitialValues);
   }, [formikSetValues, formikInitialValues]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <section className='w-full max-w-2xl'>
@@ -155,23 +150,10 @@ const ProductCategoryForm = ({
         </header>
 
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
-          {formErrorMessage && (
-            <div role='alert' className='alert alert-error'>
-              <Icon
-                icon='material-symbols:error-outline'
-                width={24}
-                height={24}
-              />
-              <span>{formErrorMessage}</span>
-            </div>
-          )}
-
-          <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
           <div className='flex flex-col gap-4'>
             <TextInput
               required
@@ -254,7 +236,7 @@ const ProductCategoryForm = ({
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit
@@ -262,6 +244,17 @@ const ProductCategoryForm = ({
               </div>
             )}
           </div>
+
+          {formErrorMessage && (
+            <div role='alert' className='alert alert-error'>
+              <Icon
+                icon='material-symbols:error-outline'
+                width={24}
+                height={24}
+              />
+              <span>{formErrorMessage}</span>
+            </div>
+          )}
         </form>
       </section>
 

src/components/pages/master-data/product/form/ProductForm.schema.ts

@@ -29,38 +29,36 @@ export const ProductFormSchema: Yup.ObjectSchema<ProductFormSchemaType> =
     sku: Yup.string().required('SKU wajib diisi!'),
 
     uom: Yup.object({
-      value: Yup.number()
-        .min(1, 'Satuan wajib dipilih!')
-        .required('Satuan wajib dipilih!'),
-      label: Yup.string().required('Satuan wajib dipilih!'),
-    }).nullable(),
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+    })
+      .nullable()
+      .required('Satuan wajib diisi!'),
 
     uom_id: Yup.number()
-      .min(1, 'Satuan wajib dipilih!')
-      .required('Satuan wajib dipilih!')
-      .typeError('Satuan wajib dipilih!'),
+      .required('Satuan wajib diisi!')
+      .typeError('Satuan wajib diisi!'),
 
     product_category: Yup.object({
-      value: Yup.number()
-        .min(1, 'Kategori produk wajib dipilih!')
-        .required('Kategori produk wajib dipilih!'),
-      label: Yup.string().required('Kategori produk wajib dipilih!'),
-    }).nullable(),
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+    })
+      .nullable()
+      .required('Kategori produk wajib diisi!'),
 
     product_category_id: Yup.number()
-      .min(1, 'Kategori produk wajib dipilih!')
-      .required('Kategori produk wajib dipilih!')
-      .typeError('Kategori produk wajib dipilih!'),
+      .required('Kategori produk wajib diisi!')
+      .typeError('Kategori produk wajib diisi!'),
 
     product_price: Yup.number()
       .required('Harga produk wajib diisi!')
       .typeError('Harga produk wajib diisi!')
-      .min(1, 'Harga produk tidak boleh kurang dari 1!'),
+      .min(0, 'Harga produk tidak boleh kurang dari 0!'),
 
     selling_price: Yup.number()
       .required('Harga jual wajib diisi!')
       .typeError('Harga jual wajib diisi!')
-      .min(1, 'Harga jual tidak boleh kurang dari 1!'),
+      .min(0, 'Harga jual tidak boleh kurang dari 0!'),
 
     tax: Yup.number()
       .required('Pajak wajib diisi!')
@@ -71,7 +69,7 @@ export const ProductFormSchema: Yup.ObjectSchema<ProductFormSchemaType> =
     expiry_period: Yup.number()
       .required('Periode kadaluarsa wajib diisi!')
       .typeError('Periode kadaluarsa wajib diisi!')
-      .min(1, 'Periode kadaluarsa tidak boleh kurang dari 1 hari!'),
+      .min(0, 'Periode kadaluarsa tidak boleh kurang dari 0!'),
 
     supplier_ids: Yup.array()
       .of(Yup.number().required().typeError('Supplier tidak valid!'))

src/components/pages/master-data/product/form/ProductForm.tsx

@@ -17,8 +17,6 @@ import SelectInput, {
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import RequirePermission from '@/components/helper/RequirePermission';
-import { getUniqueFormikErrors } from '@/lib/formik-helper';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 
 import {
   ProductFormSchema,
@@ -39,7 +37,6 @@ import {
 } from '@/services/api/master-data';
 import { cn } from '@/lib/helper';
 import { PRODUCT_FLAG_OPTIONS } from '@/config/constant';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 
 interface ProductFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -204,9 +201,6 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
     formikSetValues(formikInitialValues);
   }, [formikSetValues, formikInitialValues]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <section className='w-full max-w-2xl'>
@@ -226,24 +220,11 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
           </h1>
         </header>
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
-          {productFormErrorMessage && (
-            <div role='alert' className='alert alert-error'>
-              <Icon
-                icon='material-symbols:error-outline'
-                width={24}
-                height={24}
-              />
-              <span>{productFormErrorMessage}</span>
-            </div>
-          )}
-
-          <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
-          <div className='grid grid-cols-1 gap-4'>
+          <div className='flex flex-col gap-4'>
             <TextInput
               required
               label='Nama'
@@ -256,193 +237,179 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
               errorMessage={formik.errors.name}
               readOnly={type === 'detail'}
             />
-            <div className='grid sm:grid-cols-2 gap-4'>
-              <TextInput
-                required
-                label='Merek'
-                name='brand'
-                placeholder='Masukkan merek...'
-                value={formik.values.brand}
-                onChange={formik.handleChange}
-                onBlur={formik.handleBlur}
-                isError={formik.touched.brand && Boolean(formik.errors.brand)}
-                errorMessage={formik.errors.brand}
-                readOnly={type === 'detail'}
-              />
-              <TextInput
-                required
-                label='SKU'
-                name='sku'
-                placeholder='Masukkan SKU...'
-                value={formik.values.sku}
-                onChange={formik.handleChange}
-                onBlur={formik.handleBlur}
-                isError={formik.touched.sku && Boolean(formik.errors.sku)}
-                errorMessage={formik.errors.sku}
-                readOnly={type === 'detail'}
-              />
-            </div>
-            <div className='grid sm:grid-cols-2 gap-4'>
-              <SelectInput
-                required
-                label='Satuan'
-                placeholder='Pilih satuan...'
-                value={formik.values.uom ?? undefined}
-                onChange={uomChangeHandler}
-                options={uomOptions}
-                onInputChange={setUomSelectInputValue}
-                isLoading={isLoadingUoms}
-                isError={
-                  (formik.touched.uom || formik.touched.uom_id) &&
-                  Boolean(formik.errors.uom_id)
-                }
-                errorMessage={formik.errors.uom_id as string}
-                isDisabled={type === 'detail'}
-                isClearable
-              />
-              <SelectInput
-                required
-                label='Kategori Produk'
-                placeholder='Pilih kategori produk...'
-                value={formik.values.product_category ?? undefined}
-                onChange={categoryChangeHandler}
-                options={categoryOptions}
-                onInputChange={setCategorySelectInputValue}
-                isLoading={isLoadingCategories}
-                isError={
-                  (formik.touched.product_category ||
-                    formik.touched.product_category_id) &&
-                  Boolean(formik.errors.product_category_id)
-                }
-                errorMessage={formik.errors.product_category_id as string}
-                isDisabled={type === 'detail'}
-                isClearable
-              />
-            </div>
-            <div className='grid sm:grid-cols-2 gap-4'>
-              <NumberInput
-                required
-                label='Harga Produk'
-                name='product_price'
-                placeholder='Masukkan harga produk...'
-                value={formik.values.product_price}
-                onChange={formik.handleChange}
-                onBlur={formik.handleBlur}
-                decimalScale={2}
-                allowNegative={false}
-                thousandSeparator=','
-                decimalSeparator='.'
-                inputPrefix='Rp '
-                isError={
-                  formik.touched.product_price &&
-                  Boolean(formik.errors.product_price)
-                }
-                errorMessage={formik.errors.product_price as string}
-                readOnly={type === 'detail'}
-              />
-              <NumberInput
-                required
-                label='Harga Jual'
-                name='selling_price'
-                placeholder='Masukkan harga jual...'
-                value={formik.values.selling_price}
-                onChange={formik.handleChange}
-                onBlur={formik.handleBlur}
-                decimalScale={2}
-                allowNegative={false}
-                thousandSeparator=','
-                decimalSeparator='.'
-                inputPrefix='Rp '
-                isError={
-                  formik.touched.selling_price &&
-                  Boolean(formik.errors.selling_price)
-                }
-                errorMessage={formik.errors.selling_price as string}
-                readOnly={type === 'detail'}
-              />
-            </div>
-            <div className='grid sm:grid-cols-2 gap-4'>
-              <NumberInput
-                required
-                label='Pajak (%)'
-                name='tax'
-                placeholder='Masukkan pajak...'
-                value={formik.values.tax}
-                onChange={formik.handleChange}
-                onBlur={formik.handleBlur}
-                decimalScale={2}
-                allowNegative={false}
-                thousandSeparator=','
-                decimalSeparator='.'
-                inputSuffix='%'
-                isError={formik.touched.tax && Boolean(formik.errors.tax)}
-                errorMessage={formik.errors.tax as string}
-                readOnly={type === 'detail'}
-              />
-              <NumberInput
-                required
-                label='Periode Kadaluarsa (hari)'
-                name='expiry_period'
-                placeholder='Masukkan periode kadaluarsa...'
-                value={formik.values.expiry_period}
-                onChange={formik.handleChange}
-                onBlur={formik.handleBlur}
-                decimalScale={0}
-                allowNegative={false}
-                thousandSeparator=','
-                decimalSeparator='.'
-                inputSuffix='hari'
-                isError={
-                  formik.touched.expiry_period &&
-                  Boolean(formik.errors.expiry_period)
-                }
-                errorMessage={formik.errors.expiry_period as string}
-                readOnly={type === 'detail'}
-              />
-            </div>
-            <div className='grid sm:grid-cols-2 gap-4'>
-              <SelectInput
-                required
-                label='Supplier'
-                placeholder='Pilih supplier...'
-                isMulti
-                value={supplierOptions.filter((opt) =>
-                  (formik.values.supplier_ids || []).includes(opt.value)
-                )}
-                onChange={supplierChangeHandler}
-                options={supplierOptions}
-                onInputChange={setSupplierSelectInputValue}
-                isLoading={isLoadingSuppliers}
-                isError={
-                  formik.touched.supplier_ids &&
-                  Boolean(formik.errors.supplier_ids)
-                }
-                errorMessage={formik.errors.supplier_ids as string}
-                isDisabled={type === 'detail'}
-                isClearable
-              />
-              <SelectInput
-                required
-                label='Flags'
-                placeholder='Pilih flags...'
-                isMulti
-                value={PRODUCT_FLAG_OPTIONS.filter((opt) =>
-                  (formik.values.flags || []).includes(opt.value)
-                )}
-                onChange={(val) => {
-                  const arr = Array.isArray(val) ? val : val ? [val] : [];
-                  formik.setFieldValue(
-                    'flags',
-                    arr.map((v) => (v as OptionType).value)
-                  );
-                }}
-                options={PRODUCT_FLAG_OPTIONS}
-                isError={formik.touched.flags && Boolean(formik.errors.flags)}
-                errorMessage={formik.errors.flags as string}
-                isDisabled={type === 'detail'}
-                isClearable
-              />
-            </div>
+            <TextInput
+              required
+              label='Merek'
+              name='brand'
+              placeholder='Masukkan merek...'
+              value={formik.values.brand}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              isError={formik.touched.brand && Boolean(formik.errors.brand)}
+              errorMessage={formik.errors.brand}
+              readOnly={type === 'detail'}
+            />
+            <TextInput
+              required
+              label='SKU'
+              name='sku'
+              placeholder='Masukkan SKU...'
+              value={formik.values.sku}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              isError={formik.touched.sku && Boolean(formik.errors.sku)}
+              errorMessage={formik.errors.sku}
+              readOnly={type === 'detail'}
+            />
+            <SelectInput
+              required
+              label='Satuan'
+              placeholder='Pilih satuan...'
+              value={formik.values.uom ?? undefined}
+              onChange={uomChangeHandler}
+              options={uomOptions}
+              onInputChange={setUomSelectInputValue}
+              isLoading={isLoadingUoms}
+              isError={formik.touched.uom_id && Boolean(formik.errors.uom_id)}
+              errorMessage={formik.errors.uom_id as string}
+              isDisabled={type === 'detail'}
+              isClearable
+            />
+            <SelectInput
+              required
+              label='Kategori Produk'
+              placeholder='Pilih kategori produk...'
+              value={formik.values.product_category ?? undefined}
+              onChange={categoryChangeHandler}
+              options={categoryOptions}
+              onInputChange={setCategorySelectInputValue}
+              isLoading={isLoadingCategories}
+              isError={
+                formik.touched.product_category_id &&
+                Boolean(formik.errors.product_category_id)
+              }
+              errorMessage={formik.errors.product_category_id as string}
+              isDisabled={type === 'detail'}
+              isClearable
+            />
+            <NumberInput
+              required
+              label='Harga Produk'
+              name='product_price'
+              placeholder='Masukkan harga produk...'
+              value={formik.values.product_price}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              decimalScale={2}
+              allowNegative={false}
+              thousandSeparator=','
+              decimalSeparator='.'
+              inputPrefix='Rp '
+              isError={
+                formik.touched.product_price &&
+                Boolean(formik.errors.product_price)
+              }
+              errorMessage={formik.errors.product_price as string}
+              readOnly={type === 'detail'}
+            />
+            <NumberInput
+              required
+              label='Harga Jual'
+              name='selling_price'
+              placeholder='Masukkan harga jual...'
+              value={formik.values.selling_price}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              decimalScale={2}
+              allowNegative={false}
+              thousandSeparator=','
+              decimalSeparator='.'
+              inputPrefix='Rp '
+              isError={
+                formik.touched.selling_price &&
+                Boolean(formik.errors.selling_price)
+              }
+              errorMessage={formik.errors.selling_price as string}
+              readOnly={type === 'detail'}
+            />
+            <NumberInput
+              required
+              label='Pajak (%)'
+              name='tax'
+              placeholder='Masukkan pajak...'
+              value={formik.values.tax}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              decimalScale={2}
+              allowNegative={false}
+              thousandSeparator=','
+              decimalSeparator='.'
+              inputSuffix='%'
+              isError={formik.touched.tax && Boolean(formik.errors.tax)}
+              errorMessage={formik.errors.tax as string}
+              readOnly={type === 'detail'}
+            />
+            <NumberInput
+              required
+              label='Periode Kadaluarsa (hari)'
+              name='expiry_period'
+              placeholder='Masukkan periode kadaluarsa...'
+              value={formik.values.expiry_period}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              decimalScale={0}
+              allowNegative={false}
+              thousandSeparator=','
+              decimalSeparator='.'
+              inputSuffix='hari'
+              isError={
+                formik.touched.expiry_period &&
+                Boolean(formik.errors.expiry_period)
+              }
+              errorMessage={formik.errors.expiry_period as string}
+              readOnly={type === 'detail'}
+            />
+            <SelectInput
+              required
+              label='Supplier'
+              placeholder='Pilih supplier...'
+              isMulti
+              value={supplierOptions.filter((opt) =>
+                (formik.values.supplier_ids || []).includes(opt.value)
+              )}
+              onChange={supplierChangeHandler}
+              options={supplierOptions}
+              onInputChange={setSupplierSelectInputValue}
+              isLoading={isLoadingSuppliers}
+              isError={
+                formik.touched.supplier_ids &&
+                Boolean(formik.errors.supplier_ids)
+              }
+              errorMessage={formik.errors.supplier_ids as string}
+              isDisabled={type === 'detail'}
+              isClearable
+            />
+            <SelectInput
+              required
+              label='Flags'
+              placeholder='Pilih flags...'
+              isMulti
+              value={PRODUCT_FLAG_OPTIONS.filter((opt) =>
+                (formik.values.flags || []).includes(opt.value)
+              )}
+              onChange={(val) => {
+                const arr = Array.isArray(val) ? val : val ? [val] : [];
+                formik.setFieldValue(
+                  'flags',
+                  arr.map((v) => (v as OptionType).value)
+                );
+              }}
+              options={PRODUCT_FLAG_OPTIONS}
+              isError={formik.touched.flags && Boolean(formik.errors.flags)}
+              errorMessage={formik.errors.flags as string}
+              isDisabled={type === 'detail'}
+              isClearable
+            />
           </div>
           <div className='flex flex-row justify-between gap-2 flex-wrap'>
             {type !== 'add' && (
@@ -496,7 +463,7 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit
@@ -504,6 +471,16 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
               </div>
             )}
           </div>
+          {productFormErrorMessage && (
+            <div role='alert' className='alert alert-error'>
+              <Icon
+                icon='material-symbols:error-outline'
+                width={24}
+                height={24}
+              />
+              <span>{productFormErrorMessage}</span>
+            </div>
+          )}
         </form>
       </section>
       {type !== 'add' && (

src/components/pages/master-data/production-standard/form/ProductionStandardForm.schema.ts

@@ -18,7 +18,6 @@ const LayingRepeaterFormSchema = Yup.object({
     ),
     target_egg_weight: Yup.number().required('Berat telur wajib diisi!'),
     target_egg_mass: Yup.number().required('Massa telur wajib diisi!'),
-    standard_fcr: Yup.number().required('FCR wajib diisi!'),
   }).required(),
 });
 
@@ -36,7 +35,6 @@ const GrowingRepeaterFormSchema = Yup.object({
     target_hen_house_production: Yup.number().optional(),
     target_egg_weight: Yup.number().optional(),
     target_egg_mass: Yup.number().optional(),
-    standard_fcr: Yup.number().optional(),
   }).optional(),
 });
 

src/components/pages/master-data/production-standard/form/ProductionStandardForm.tsx

@@ -9,7 +9,6 @@ import {
   ProductionStandardRepeaterFormSchemaValues,
   ProductionStandardFormValues,
   createProductionStandardRepeaterFormSchema,
-  ProductionStandardFormSchema,
 } from '@/components/pages/master-data/production-standard/form/ProductionStandardForm.schema';
 import Table, { TABLE_DEFAULT_STYLING } from '@/components/Table';
 import { FLOCK_CATEGORY_OPTIONS } from '@/config/constant';
@@ -31,9 +30,6 @@ import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import { useModal } from '@/components/Modal';
 import RequirePermission from '@/components/helper/RequirePermission';
 import Tooltip from '@/components/Tooltip';
-import Alert from '@/components/Alert';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 
 type TableRowsType = {
   customRow: boolean;
@@ -46,7 +42,6 @@ type ProductionDetailsErrors = {
   target_hen_house_production?: string;
   target_egg_weight?: string;
   target_egg_mass?: string;
-  standard_fcr?: string;
 };
 
 type ProductionDetailsTouched = {
@@ -54,7 +49,6 @@ type ProductionDetailsTouched = {
   target_hen_house_production?: boolean;
   target_egg_weight?: boolean;
   target_egg_mass?: boolean;
-  standard_fcr?: boolean;
 };
 
 const getProductionDetailsError = (
@@ -98,9 +92,6 @@ const convertPayloadToNumberTypes = (payload: ProductionStandardFormValues) => {
             target_egg_mass: Number(
               detail.production_standard_details.target_egg_mass
             ),
-            standard_fcr: Number(
-              detail.production_standard_details.standard_fcr
-            ),
           }
         : undefined,
       production_standard_uniformity_details: {
@@ -141,9 +132,6 @@ const convertStandardValueToFormValues = (
           target_egg_mass: Number(
             detail.egg_production_standard_detail.target_egg_mass
           ),
-          standard_fcr: Number(
-            detail.egg_production_standard_detail.standard_fcr
-          ),
         }
       : undefined,
     production_standard_uniformity_details: {
@@ -210,7 +198,6 @@ const ProductionStandardForm = ({
     initialValues: formikInitialValues as ProductionStandardFormValues,
     // Only enable reinitialize for edit/detail mode, not add mode
     enableReinitialize: formType !== 'add',
-    validationSchema: ProductionStandardFormSchema,
     onSubmit: (values) => {
       switch (formType) {
         case 'add':
@@ -239,7 +226,6 @@ const ProductionStandardForm = ({
         target_hen_house_production: '' as unknown as number,
         target_egg_weight: '' as unknown as number,
         target_egg_mass: '' as unknown as number,
-        standard_fcr: '' as unknown as number,
       },
       production_standard_uniformity_details: {
         target_mean_bw: '' as unknown as number,
@@ -378,12 +364,6 @@ const ProductionStandardForm = ({
                 row.production_standard_details?.target_egg_mass,
               enableSorting: false,
             },
-            {
-              header: 'FCR',
-              accessorFn: (row) =>
-                row.production_standard_details?.standard_fcr,
-              enableSorting: false,
-            },
           ]
         : [];
 
@@ -696,7 +676,6 @@ const ProductionStandardForm = ({
           target_hen_house_production: 0,
           target_egg_weight: 0,
           target_egg_mass: 0,
-          standard_fcr: 0,
         },
       }));
     }
@@ -727,8 +706,7 @@ const ProductionStandardForm = ({
     router.push('/master-data/production-standard');
   };
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
+  // ===== Function =====
 
   return (
     <>
@@ -831,7 +809,7 @@ const ProductionStandardForm = ({
                         className={cn(
                           'grid gap-4 items-start',
                           formik.values.project_category === 'LAYING'
-                            ? 'grid-cols-10'
+                            ? 'grid-cols-9'
                             : 'grid-cols-5'
                         )}
                       >
@@ -990,41 +968,6 @@ const ProductionStandardForm = ({
                                 )
                               }
                             />
-                            <NumberInput
-                              name='production_standard_details.standard_fcr'
-                              label='FCR'
-                              placeholder='1'
-                              value={
-                                repeaterFormik.values
-                                  .production_standard_details?.standard_fcr
-                              }
-                              onChange={repeaterFormik.handleChange}
-                              onBlur={repeaterFormik.handleBlur}
-                              endAdornment={
-                                <div className='w-full h-full flex items-center justify-center'>
-                                  gr
-                                </div>
-                              }
-                              errorMessage={getProductionDetailsError(
-                                repeaterFormik.errors
-                                  .production_standard_details,
-                                'standard_fcr'
-                              )}
-                              isError={
-                                Boolean(
-                                  getProductionDetailsError(
-                                    repeaterFormik.errors
-                                      .production_standard_details,
-                                    'standard_fcr'
-                                  )
-                                ) &&
-                                getProductionDetailsTouched(
-                                  repeaterFormik.touched
-                                    .production_standard_details,
-                                  'standard_fcr'
-                                )
-                              }
-                            />
                           </>
                         )}
                         <NumberInput
@@ -1215,26 +1158,9 @@ const ProductionStandardForm = ({
             return null;
           }}
         />
-
-        <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
-        {productionStandardFormErrorMessage && (
-          <Alert color='error' className='w-full'>
-            <div className='flex items-center gap-2 stretch'>
-              <Icon icon='mdi:alert' />
-              <span>{productionStandardFormErrorMessage}</span>
-            </div>
-            <Icon
-              icon='mdi:close'
-              onClick={() => setProductionStandardFormErrorMessage('')}
-              className='ms-auto'
-            />
-          </Alert>
-        )}
-
         <form
           className='flex justify-between mt-6 gap-2 flex-wrap'
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
         >
           {formType === 'detail' && (
             <div className='gap-2 flex items-center'>

src/components/pages/master-data/supplier/form/SupplierForm.tsx

@@ -25,8 +25,6 @@ import TextArea from '@/components/input/TextArea';
 import { cn } from '@/lib/helper';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import RequirePermission from '@/components/helper/RequirePermission';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 
 interface SupplierCustomProps {
   formType?: 'add' | 'edit' | 'detail';
@@ -201,9 +199,6 @@ const SupplierForm = ({
     formik.setFieldValue('category', val);
   };
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   // Render
   return (
     <>
@@ -226,7 +221,7 @@ const SupplierForm = ({
         </header>
 
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
@@ -449,8 +444,6 @@ const SupplierForm = ({
               </div>
             )}
 
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
             {formType !== 'detail' && (
               <div
                 className={cn('flex flex-row justify-end gap-2', {
@@ -465,7 +458,7 @@ const SupplierForm = ({
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit

src/components/pages/master-data/uom/form/UomForm.tsx

@@ -25,8 +25,6 @@ import {
 } from '@/types/api/master-data/uom';
 import { UomApi } from '@/services/api/master-data';
 import { cn } from '@/lib/helper';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 
 interface UomFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -120,9 +118,6 @@ const UomForm = ({ type = 'add', initialValues }: UomFormProps) => {
     formikSetValues(formikInitialValues);
   }, [formikSetValues, formikInitialValues]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <section className='w-full max-w-xl'>
@@ -144,7 +139,7 @@ const UomForm = ({ type = 'add', initialValues }: UomFormProps) => {
         </header>
 
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
@@ -204,8 +199,6 @@ const UomForm = ({ type = 'add', initialValues }: UomFormProps) => {
               </div>
             )}
 
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
             {type !== 'detail' && (
               <div
                 className={cn('flex flex-row justify-end gap-2', {
@@ -220,7 +213,7 @@ const UomForm = ({ type = 'add', initialValues }: UomFormProps) => {
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit

src/components/pages/master-data/warehouse/form/WarehouseForm.tsx

@@ -33,8 +33,6 @@ import {
 } from '@/services/api/master-data';
 import { cn } from '@/lib/helper';
 import { WAREHOUSE_TYPE_OPTIONS } from '@/config/constant';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 
 interface WarehouseFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -325,9 +323,6 @@ const WarehouseForm = ({ type = 'add', initialValues }: WarehouseFormProps) => {
     formikSetValues(formikInitialValues);
   }, [formikSetValues, formikInitialValues]);
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <section className='w-full max-w-xl'>
@@ -349,7 +344,7 @@ const WarehouseForm = ({ type = 'add', initialValues }: WarehouseFormProps) => {
         </header>
 
         <form
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
           className='w-full mt-8 flex flex-col gap-6'
         >
@@ -426,8 +421,8 @@ const WarehouseForm = ({ type = 'add', initialValues }: WarehouseFormProps) => {
                 value={formik.values.kandang ?? undefined}
                 onChange={kandangChangeHandler}
                 options={kandangOptions}
-                onInputChange={setKandangSelectInputValue}
-                isLoading={isLoadingKandangs}
+                onInputChange={setLocationSelectInputValue}
+                isLoading={isLoadingLocations}
                 isError={
                   formik.touched.kandangId && Boolean(formik.errors.kandangId)
                 }
@@ -479,8 +474,6 @@ const WarehouseForm = ({ type = 'add', initialValues }: WarehouseFormProps) => {
               </div>
             )}
 
-            <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
             {type !== 'detail' && (
               <div
                 className={cn('flex flex-row justify-end gap-2', {
@@ -495,7 +488,7 @@ const WarehouseForm = ({ type = 'add', initialValues }: WarehouseFormProps) => {
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4'
                 >
                   Submit

src/components/pages/production/chickin/form/ChickinForm.tsx

@@ -18,7 +18,6 @@ import { Icon } from '@iconify/react';
 import Badge from '@/components/Badge';
 import { CHICKINS_APPROVAL_LINE } from '@/config/approval-line';
 import RequirePermission from '@/components/helper/RequirePermission';
-import { BaseApproval } from '@/types/api/api-general';
 const ChickinFormKandang = ({
   formType = 'add',
   initialValues,
@@ -34,16 +33,11 @@ const ChickinFormKandang = ({
     approvals,
     isLoading: approvalsLoading,
     refresh: refreshApprovals,
-    rawDataApprovals,
   } = useApprovalSteps({
-    latestApproval: initialValues?.chickin_approval,
+    latestApproval: initialValues?.approval,
     approvalLines: CHICKINS_APPROVAL_LINE,
     moduleName: 'CHICKINS',
     moduleId: initialValues?.id.toString() ?? '',
-    params: {
-      limit: 'limit',
-      group_step_number: false,
-    },
   });
 
   const afterSubmitFormChickin = () => {
@@ -186,7 +180,6 @@ const ChickinFormKandang = ({
       </div>
       {openChickin && (
         <ChickinLogsView
-          rawDataApprovals={rawDataApprovals as BaseApproval[]}
           initialValues={initialValues}
           afterSubmit={afterSubmitFormChickin}
         />

src/components/pages/production/chickin/form/tabs/ChickLogsView.tsx

@@ -8,7 +8,6 @@ import PillBadge from '@/components/PillBadge';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { formatDate, formatNumber } from '@/lib/helper';
 import { ChickinApi } from '@/services/api/production/chickin';
-import { BaseApproval } from '@/types/api/api-general';
 import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
 import { Icon } from '@iconify/react';
 import { useState } from 'react';
@@ -17,11 +16,9 @@ import toast from 'react-hot-toast';
 const ChickinLogsView = ({
   initialValues,
   afterSubmit,
-  rawDataApprovals,
 }: {
   initialValues: ProjectFlockKandang;
   afterSubmit?: () => void;
-  rawDataApprovals: BaseApproval[];
 }) => {
   const confirmModal = useModal();
   const [isApproveLoading, setIsApproveLoading] = useState(false);
@@ -63,15 +60,8 @@ const ChickinLogsView = ({
           </div>
         ) : (
           (initialValues?.chickins || []).map((chickin, index) => {
-            const latestApproval = rawDataApprovals[0];
-            const isApproved =
-              index == (initialValues?.chickins || []).length - 1
-                ? latestApproval?.step_number === 2
-                : true;
-            const isPending =
-              index == (initialValues?.chickins || []).length - 1
-                ? latestApproval?.step_number === 1
-                : false;
+            const isApproved = chickin.usage_qty !== 0;
+            const isPending = chickin.pending_usage_qty !== 0;
             const quantity = isApproved
               ? chickin.usage_qty
               : isPending
@@ -91,7 +81,7 @@ const ChickinLogsView = ({
                   {/* Header with Status Badge */}
                   <div className='flex flex-row justify-between items-center'>
                     <div className='text-lg font-semibold'>
-                      Chick In #{index + 1} - {latestApproval?.step_number}
+                      Chick In #{index + 1}
                     </div>
                     <PillBadge
                       content={
@@ -156,19 +146,18 @@ const ChickinLogsView = ({
           })
         )}
 
-        {initialValues.chickin_approval &&
-          initialValues?.chickin_approval?.step_number < 2 && (
-            <RequirePermission permissions='lti.production.chickins.approve'>
-              <Button
-                color='success'
-                onClick={handleClickApprove}
-                className='w-full'
-              >
-                <Icon width={24} height={24} icon='material-symbols:check' />
-                Approve Semua Chick In
-              </Button>
-            </RequirePermission>
-          )}
+        {initialValues?.approval?.step_number <= 2 && (
+          <RequirePermission permissions='lti.production.chickins.approve'>
+            <Button
+              color='success'
+              onClick={handleClickApprove}
+              className='w-full'
+            >
+              <Icon width={24} height={24} icon='material-symbols:check' />
+              Approve Semua Chick In
+            </Button>
+          </RequirePermission>
+        )}
 
         {chickinErrorMessage && (
           <div className='w-full' onClick={() => setChickinErrorMessage('')}>

src/components/pages/production/project-flock/ProjectFlockTable.tsx

@@ -19,7 +19,7 @@ import { useTableFilter } from '@/services/hooks/useTableFilter';
 import { Kandang } from '@/types/api/master-data/kandang';
 import { ProjectFlock } from '@/types/api/production/project-flock';
 import { Icon } from '@iconify/react';
-import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
+import { CellContext, SortingState } from '@tanstack/react-table';
 import { useRouter } from 'next/navigation';
 import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
 import toast from 'react-hot-toast';
@@ -27,6 +27,84 @@ import useSWR from 'swr';
 
 import RequirePermission from '@/components/helper/RequirePermission';
 
+const RowOptionsMenu = ({
+  type = 'dropdown',
+  props,
+  deleteClickHandler,
+}: {
+  type: 'dropdown' | 'collapse';
+  props: CellContext<ProjectFlock, unknown>;
+  deleteClickHandler: () => void;
+}) => {
+  return (
+    <div
+      tabIndex={type == 'dropdown' ? 0 : undefined}
+      className={cn(
+        {
+          'dropdown-content': type === 'dropdown',
+          'mt-2': type === 'collapse',
+        },
+        'p-2.5 mr-2 bg-base-100 rounded-box z-10 border border-black/10 shadow'
+      )}
+    >
+      <div className='flex flex-col gap-1'>
+        <RequirePermission permissions='lti.production.project_flocks.detail'>
+          <Button
+            href={`/production/project-flock/detail?projectFlockId=${props.row.original.id}`}
+            variant='ghost'
+            color='primary'
+            className='justify-start text-sm'
+          >
+            <Icon icon='mdi:eye-outline' width={16} height={16} />
+            Detail
+          </Button>
+        </RequirePermission>
+        {props.row.original.approval.step_name === 'Aktif' && (
+          <RequirePermission permissions='lti.production.chickins.create'>
+            <Button
+              href={`/production/project-flock/chickin/add?projectFlockId=${props.row.original.id}`}
+              variant='ghost'
+              color='success'
+              className='justify-start text-sm'
+            >
+              <Icon icon='mdi:home-import-outline' width={16} height={16} />
+              Chickin
+            </Button>
+          </RequirePermission>
+        )}
+        {props.row.original.approval.step_name === 'Pengajuan' && (
+          <RequirePermission permissions='lti.production.project_flocks.update'>
+            <Button
+              href={`/production/project-flock/detail/edit?projectFlockId=${props.row.original.id}`}
+              variant='ghost'
+              color='warning'
+              className='justify-start text-sm'
+            >
+              <Icon icon='mdi:pencil-outline' width={16} height={16} />
+              Edit
+            </Button>
+          </RequirePermission>
+        )}
+        <RequirePermission permissions='lti.production.project_flocks.delete'>
+          <Button
+            onClick={deleteClickHandler}
+            variant='ghost'
+            color='error'
+            className='text-error hover:text-inherit justify-start text-sm'
+          >
+            <Icon
+              icon='material-symbols:delete-outline-rounded'
+              width={16}
+              height={16}
+            />
+            Delete
+          </Button>
+        </RequirePermission>
+      </div>
+    </div>
+  );
+};
+
 const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
   const {
     state: tableFilterState,
@@ -71,6 +149,8 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
   );
   const [periodInputValue, setPeriodInputValue] = useState<number | null>(null);
   const [sorting, setSorting] = useState<SortingState>([]);
+  const [selectedProjectFlock, setSelectedProjectFlock] =
+    useState<ProjectFlock>();
   const deleteModal = useModal();
   const confirmModal = useModal();
   const [approvalAction, setApprovalAction] = useState<'APPROVED' | 'REJECTED'>(
@@ -141,21 +221,18 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
     : [];
 
   // ====== HANDLER ======
+  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+    const newVal = val as OptionType;
+    setPageSize(newVal.value as number);
+  };
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
-    const response = await ProjectFlockApi.delete(
-      selectedSingleRow?.id as number
-    );
-    if (isResponseSuccess(response)) {
-      toast.success(response?.message as string);
-    }
-    if (isResponseError(response)) {
-      toast.error(response?.message as string);
-    }
+    await ProjectFlockApi.delete(selectedSingleRow?.id as number);
     refreshProjectFlocks();
 
     deleteModal.closeModal();
+    toast.success('Successfully delete Project Flock!');
     setIsDeleteLoading(false);
     setRowSelection({});
   };
@@ -208,146 +285,12 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
   const canApprove = useMemo(() => {
     if (!selectedSingleRow || isApproveLoading) return false;
 
-    const isPengajuan = selectedSingleRow.approval?.step_number == 1;
-    const isNotRejected = selectedSingleRow.approval?.action != 'REJECTED';
+    const isPengajuan = selectedSingleRow.approval.step_number == 1;
+    const isNotRejected = selectedSingleRow.approval.action != 'REJECTED';
 
     return isPengajuan && isNotRejected;
   }, [selectedSingleRow, isApproveLoading]);
 
-  // ====== COLUMNS ======
-  const columns = useMemo<ColumnDef<ProjectFlock>[]>(
-    () => [
-      {
-        id: 'select',
-        header: ({ table }) => {
-          const allRows = table.getRowModel().rows;
-          const selectableRows = allRows;
-
-          const allSelected =
-            selectableRows.every((row) => row.getIsSelected()) &&
-            selectableRows.length != 0;
-
-          const someSelected =
-            selectableRows.some((row) => row.getIsSelected()) && !allSelected;
-
-          const toggleSelectableRows = () => {
-            const shouldSelect = !allSelected;
-            selectableRows.forEach((row) => row.toggleSelected(shouldSelect));
-          };
-
-          return (
-            <div className='w-full flex flex-row justify-center'>
-              <CheckboxInput
-                name='allRow'
-                checked={allSelected}
-                indeterminate={someSelected}
-                onChange={toggleSelectableRows}
-              />
-            </div>
-          );
-        },
-        cell: ({ row }) => {
-          return (
-            <CheckboxInput
-              name='row'
-              checked={row.getIsSelected()}
-              disabled={!row.getCanSelect()}
-              indeterminate={row.getIsSomeSelected()}
-              onChange={row.getToggleSelectedHandler()}
-            />
-          );
-        },
-      },
-
-      {
-        accessorKey: 'flock_name',
-        header: 'Flock',
-      },
-      {
-        accessorKey: 'area.name',
-        header: 'Area',
-      },
-      {
-        accessorKey: 'location.name',
-        header: 'Lokasi',
-      },
-      {
-        accessorKey: 'fcr.name',
-        header: 'FCR',
-      },
-      {
-        accessorKey: 'category',
-        header: 'Kategori',
-      },
-      {
-        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',
-        cell: (props) => {
-          const kandang = props.row.original.kandangs;
-          if (kandang) {
-            const kandangNames = kandang.map((k: Kandang) => k.name);
-            return (
-              <div>
-                {kandangNames.length > 0
-                  ? kandangNames.join(', ')
-                  : 'Tidak ada'}
-              </div>
-            );
-          } else {
-            return '-';
-          }
-        },
-      },
-      {
-        accessorKey: 'period',
-        header: 'Periode',
-      },
-      {
-        accessorKey: 'created_at',
-        header: 'Dibuat pada',
-        cell: (props) =>
-          formatDate(props.row.original.created_at, 'MMM DD, YYYY'),
-      },
-    ],
-    []
-  );
-
   return (
     <>
       <div className='min-h-screen w-full p-4'>
@@ -358,10 +301,7 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
                 <Button
                   color='primary'
                   className='w-full sm:w-fit'
-                  onClick={() => {
-                    setRowSelection({});
-                    router.push('/production/project-flock/add');
-                  }}
+                  href='/production/project-flock/add'
                 >
                   <Icon icon='ic:round-plus' width={24} height={24} />
                   Tambah
@@ -370,7 +310,7 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
               <div className='ms-auto w-full sm:w-auto'>
                 <DebouncedTextInput
                   name='search'
-                  placeholder='Cari Project Flock'
+                  placeholder='Cari Area'
                   value={tableFilterState.search}
                   onChange={searchChangeHandler}
                   className={{
@@ -432,18 +372,160 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
                 type='number'
                 label='Periode'
                 placeholder='Masukan periode'
-                value={periodInputValue?.toString() ?? ''}
+                value={periodInputValue ?? ''}
                 onChange={(e) => {
                   setPeriodInputValue(parseInt(e.target.value));
                   updateFilter('periodFilter', e.target.value);
                 }}
               />
+              <SelectInput
+                label='Baris'
+                options={ROWS_OPTIONS}
+                value={{
+                  label: String(tableFilterState.pageSize),
+                  value: tableFilterState.pageSize,
+                }}
+                onChange={pageSizeChangeHandler}
+                className={{ wrapper: 'max-w-28' }}
+              />
             </div>
           </div>
 
           <Table<ProjectFlock>
             data={isResponseSuccess(projectFlocks) ? projectFlocks?.data : []}
-            columns={columns}
+            columns={[
+              {
+                id: 'select',
+                header: ({ table }) => {
+                  const allRows = table.getRowModel().rows;
+                  const selectableRows = allRows;
+
+                  const allSelected =
+                    selectableRows.every((row) => row.getIsSelected()) &&
+                    selectableRows.length != 0;
+
+                  const someSelected =
+                    selectableRows.some((row) => row.getIsSelected()) &&
+                    !allSelected;
+
+                  const toggleSelectableRows = () => {
+                    const shouldSelect = !allSelected;
+                    selectableRows.forEach((row) =>
+                      row.toggleSelected(shouldSelect)
+                    );
+                  };
+
+                  return (
+                    <div className='w-full flex flex-row justify-center'>
+                      <CheckboxInput
+                        name='allRow'
+                        checked={allSelected}
+                        indeterminate={someSelected}
+                        onChange={toggleSelectableRows}
+                      />
+                    </div>
+                  );
+                },
+                cell: ({ row }) => {
+                  return (
+                    <CheckboxInput
+                      name='row'
+                      checked={row.getIsSelected()}
+                      disabled={!row.getCanSelect()}
+                      indeterminate={row.getIsSomeSelected()}
+                      onChange={row.getToggleSelectedHandler()}
+                    />
+                  );
+                },
+              },
+
+              {
+                accessorKey: 'flock_name',
+                header: 'Flock',
+              },
+              {
+                accessorKey: 'area.name',
+                header: 'Area',
+              },
+              {
+                accessorKey: 'location.name',
+                header: 'Lokasi',
+              },
+              {
+                accessorKey: 'fcr.name',
+                header: 'FCR',
+              },
+              {
+                accessorKey: 'category',
+                header: 'Kategori',
+              },
+              {
+                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',
+                cell: (props) => {
+                  const kandang = props.row.original.kandangs;
+                  if (kandang) {
+                    const kandangNames = kandang.map((k: Kandang) => k.name);
+                    return (
+                      <div>
+                        {kandangNames.length > 0
+                          ? kandangNames.join(', ')
+                          : 'Tidak ada'}
+                      </div>
+                    );
+                  } else {
+                    return '-';
+                  }
+                },
+              },
+              {
+                accessorKey: 'period',
+                header: 'Periode',
+              },
+              {
+                accessorKey: 'created_at',
+                header: 'Dibuat pada',
+                cell: (props) =>
+                  formatDate(props.row.original.created_at, 'MMM DD, YYYY'),
+              },
+            ]}
             pageSize={tableFilterState.pageSize}
             page={
               isResponseSuccess(projectFlocks) ? projectFlocks?.meta?.page : 0
@@ -453,12 +535,7 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
                 ? projectFlocks?.meta?.total_results
                 : 0
             }
-            onPageChange={(page) => {
-              setPage(page);
-            }}
-            onPageSizeChange={(pageSize) => {
-              setPageSize(pageSize);
-            }}
+            onPageChange={setPage}
             isLoading={isLoading}
             sorting={sorting}
             setSorting={setSorting}
@@ -466,9 +543,9 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
             setRowSelection={setRowSelection}
             className={{
               containerClassName: cn({
-                'mb-40':
+                'mb-20':
                   isResponseSuccess(projectFlocks) &&
-                  projectFlocks?.data?.length > 0,
+                  projectFlocks?.data?.length === 0,
               }),
               tableWrapperClassName: 'overflow-x-auto min-h-full!',
               tableClassName: 'font-inter w-full table-auto min-h-full!',

src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx

@@ -209,6 +209,20 @@ const ProjectFlockDetail = ({
                 </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 
@@ -238,18 +252,6 @@ const ProjectFlockDetail = ({
               </div>
               <div className='col-span-2'>{projectFlock?.fcr?.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' />{' '}
-                Standard
-              </div>
-              <div className='col-span-2'>
-                {projectFlock?.production_standard?.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' />{' '}

src/components/pages/production/project-flock/form/ProjectFlockForm.schema.ts

@@ -64,9 +64,9 @@ export const ProjectFlockBudgetsSchema: Yup.ObjectSchema<ProjectFlockBudgetsSche
       .min(1, 'Harga minimal 1!')
       .required('Harga wajib diisi!'),
     total_price: Yup.number()
-      .typeError('Total Harga harus berupa angka!')
-      .min(1, 'Total Harga minimal 1!')
-      .required('Total Harga wajib diisi!'),
+      .typeError('Harga harus berupa angka!')
+      .min(1, 'Harga minimal 1!')
+      .required('Harga wajib diisi!'),
   });
 
 export const ProjectFlockFormSchema: Yup.ObjectSchema<ProjectFlockFormSchemaType> =

src/components/pages/production/project-flock/form/ProjectFlockForm.tsx

@@ -6,7 +6,6 @@ import SelectInput, {
   useSelect,
 } from '@/components/input/SelectInput';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import AlertErrorList from '@/components/helper/form/FormErrors';
 import {
   AreaApi,
   FcrApi,
@@ -39,6 +38,11 @@ import { BaseApiResponse } from '@/types/api/api-general';
 import { FLOCK_CATEGORY_OPTIONS } from '@/config/constant';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import ApprovalSteps, {
+  useApprovalSteps,
+} from '@/components/pages/ApprovalSteps';
+import { PROJECT_FLOCK_APPROVAL_LINE } from '@/config/approval-line';
+import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
 import NumberInput from '@/components/input/NumberInput';
 import Card from '@/components/Card';
 import ProjectFlockKandangTable from '@/components/pages/production/project-flock/form/ProjectFlockKandangTable';
@@ -46,7 +50,6 @@ import { Nonstock } from '@/types/api/master-data/nonstock';
 import { useUiStore } from '@/stores/ui/ui.store';
 import RequirePermission from '@/components/helper/RequirePermission';
 import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
-import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 
 interface ProjectFlockFormProps {
   formType?: 'add' | 'edit' | 'detail';
@@ -68,7 +71,6 @@ const ProjectFlockForm = ({
     useState('');
   const [selectedArea, setSelectedArea] = useState('');
   const [selectedLocation, setSelectedLocation] = useState('');
-  const [selectedCategory, setSelectedCategory] = useState('');
   const [disabledLocation, setDisabledLocation] = useState(
     initialValues?.location?.id ? false : true
   );
@@ -88,8 +90,18 @@ const ProjectFlockForm = ({
   const setIsValid = useUiStore((s) => s.setIsValid);
 
   const deleteModal = useModal();
+  const confirmModal = useModal();
 
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
+  const [isApproveLoading, setIsApproveLoading] = useState(false);
+  const [isApprovedDisabled, setIsApprovedDisabled] = useState(
+    initialValues?.approval?.step_name == 'Pengajuan' ? false : true
+  );
+  const [isRejectedDisabled, setIsRejectedDisabled] =
+    useState(!isApprovedDisabled);
+  const [approvalAction, setApprovalAction] = useState<'APPROVED' | 'REJECTED'>(
+    !isApprovedDisabled ? 'APPROVED' : 'REJECTED'
+  );
 
   const [rowSelection, setRowSelection] = useState<Record<string, boolean>>(
     () =>
@@ -128,15 +140,11 @@ const ProjectFlockForm = ({
   const {
     options: optionsProductionStandards,
     isLoadingOptions: isLoadingProductionStandards,
-  } = useSelect(ProductionStandardApi.basePath, 'id', 'name', '', {
-    search: '',
-    project_category: selectedCategory,
-  });
+  } = useSelect(ProductionStandardApi.basePath, 'id', 'name');
 
   const kandangUrl = `${KandangApi.basePath}?${new URLSearchParams({
     search: '',
     location_id: selectedLocation == '' ? '0' : selectedLocation,
-    limit: 'limit',
   }).toString()}`;
   const {
     data: kandang,
@@ -155,6 +163,17 @@ const ProjectFlockForm = ({
     isLoadingOptions: isLoadingNonstocks,
   } = useSelect<Nonstock>(NonstockApi.basePath, 'id', 'name');
 
+  const {
+    approvals,
+    isLoading: approvalsLoading,
+    refresh: refreshApprovals,
+  } = useApprovalSteps({
+    latestApproval: initialValues?.approval,
+    approvalLines: PROJECT_FLOCK_APPROVAL_LINE,
+    moduleName: 'PROJECT_FLOCKS',
+    moduleId: initialValues?.id.toString() ?? '',
+  });
+
   useEffect(() => {
     if (isResponseSuccess(kandang)) {
       if (selectedLocation) {
@@ -244,19 +263,9 @@ const ProjectFlockForm = ({
   };
 
   const categoryChangeHandler = (val: OptionType | OptionType[] | null) => {
-    // Reset production standard when category is changed
-    formik.setFieldValue('production_standard_id', '');
-    formik.setFieldValue('production_standard', '');
-
+    formik.setFieldValue('category', (val as OptionType)?.value);
     formik.setFieldValue('category_option', val);
-    formik.setFieldValue('category', val ? (val as OptionType)?.value : '');
-
-    setSelectedCategory((val as OptionType)?.value as string);
-
-    if (Boolean(val)) {
-      formik.setFieldTouched('category', false);
-      formik.setFieldError('category', '');
-    } else {
+    if (val == null) {
       formik.setFieldTouched('category', true);
     }
   };
@@ -395,6 +404,8 @@ const ProjectFlockForm = ({
     validationSchema:
       formType == 'add' ? ProjectFlockFormSchema : UpdateProjectFlockFormSchema,
     validateOnBlur: true,
+    // validateOnChange: true,
+    // validateOnMount: true,
     onSubmit: async (values) => {
       setProjectFlockFormErrorMessage('');
       const payload: CreateProjectFlockPayload = {
@@ -511,6 +522,19 @@ const ProjectFlockForm = ({
     return unsub;
   }, []);
 
+  useEffect(() => {
+    if (initialValues?.approval?.step_name) {
+      const pengajuanRejected =
+        initialValues.approval.step_number == 1 &&
+        initialValues.approval.action == 'REJECTED';
+      const approvedDisabled =
+        initialValues.approval.step_number !== 1 || pengajuanRejected;
+      setIsApprovedDisabled(approvedDisabled);
+      setIsRejectedDisabled(!approvedDisabled || pengajuanRejected);
+      setApprovalAction(!approvedDisabled ? 'APPROVED' : 'REJECTED');
+    }
+  }, [initialValues]);
+
   // Actions handler
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
@@ -564,6 +588,29 @@ const ProjectFlockForm = ({
     }
   };
 
+  const confirmApprovalHandler = async (
+    notes: string,
+    approvalAction: 'REJECTED' | 'APPROVED'
+  ) => {
+    if (initialValues?.id === undefined) return;
+    setIsApproveLoading(true);
+
+    const approvalRes =
+      approvalAction == 'APPROVED'
+        ? await ProjectFlockApi.approve(initialValues?.id, notes)
+        : await ProjectFlockApi.reject(initialValues?.id, notes);
+    if (isResponseSuccess(approvalRes)) {
+      refreshProjectFlocks?.();
+      toast.success(approvalRes.message as string);
+    }
+    if (isResponseError(approvalRes)) {
+      toast.error(approvalRes?.message as string);
+    }
+    refreshApprovals();
+    confirmModal.closeModal();
+    setIsApproveLoading(false);
+  };
+
   const handleBudgetChange = (
     index: number,
     fieldName: 'qty' | 'price' | 'total_price',
@@ -641,9 +688,6 @@ const ProjectFlockForm = ({
     return !isNonstockAlreadyInBudgets;
   });
 
-  // ===== Formik Error List =====
-  const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
-
   return (
     <>
       <section className='w-full'>
@@ -700,10 +744,50 @@ const ProjectFlockForm = ({
             </div>
           </div>
         )}
-
+        {approvals && !approvalsLoading && formType == 'detail' && (
+          <ApprovalSteps approvals={approvals} />
+        )}
+        {formType == 'detail' && (
+          <div className='w-full flex flex-col sm:flex-row gap-2 py-4'>
+            <RequirePermission permissions='lti.production.project_flocks.approve'>
+              <Button
+                variant='outline'
+                color='success'
+                onClick={() => {
+                  if (initialValues?.id) {
+                    setApprovalAction('APPROVED');
+                    confirmModal.openModal();
+                  }
+                }}
+                disabled={!initialValues?.id || isApprovedDisabled}
+                className='w-full sm:w-fit'
+              >
+                <Icon icon='material-symbols:check' width={24} height={24} />
+                Approve
+              </Button>
+            </RequirePermission>
+            <RequirePermission permissions='lti.production.project_flocks.approve'>
+              <Button
+                variant='outline'
+                color='error'
+                onClick={() => {
+                  if (initialValues?.id) {
+                    setApprovalAction('REJECTED');
+                    confirmModal.openModal();
+                  }
+                }}
+                disabled={!initialValues?.id || isRejectedDisabled}
+                className='w-full sm:w-fit'
+              >
+                <Icon icon='mdi:times' width={24} height={24} />
+                Reject
+              </Button>
+            </RequirePermission>
+          </div>
+        )}
         <form
           className='w-auto h-auto'
-          onSubmit={handleFormSubmit}
+          onSubmit={formik.handleSubmit}
           onReset={formik.handleReset}
         >
           {/* Form Informasi Umum */}
@@ -788,19 +872,6 @@ const ProjectFlockForm = ({
                 isClearable
                 isDisabled={formType != 'add'}
               />
-              <SelectInput
-                required
-                label='Kategori'
-                value={formik.values.category_option as OptionType}
-                onChange={categoryChangeHandler}
-                options={FLOCK_CATEGORY_OPTIONS}
-                isError={
-                  formik.touched.category && Boolean(formik.errors.category)
-                }
-                errorMessage={formik.errors.category as string}
-                isClearable
-                isDisabled={formType != 'add'}
-              />
               <SelectInput
                 required
                 label='Standar Produksi'
@@ -811,10 +882,23 @@ const ProjectFlockForm = ({
                 options={optionsProductionStandards}
                 isLoading={isLoadingProductionStandards}
                 isError={
-                  formik.touched.production_standard_id &&
-                  Boolean(formik.errors.production_standard_id)
+                  formik.touched.production_standard &&
+                  Boolean(formik.errors.production_standard)
                 }
-                errorMessage={formik.errors.production_standard_id as string}
+                errorMessage={formik.errors.production_standard as string}
+                isClearable
+                isDisabled={formType != 'add'}
+              />
+              <SelectInput
+                required
+                label='Kategori'
+                value={formik.values.category_option as OptionType}
+                onChange={categoryChangeHandler}
+                options={FLOCK_CATEGORY_OPTIONS}
+                isError={
+                  formik.touched.category && Boolean(formik.errors.category)
+                }
+                errorMessage={formik.errors.category as string}
                 isClearable
                 isDisabled={formType != 'add'}
               />
@@ -1069,9 +1153,15 @@ const ProjectFlockForm = ({
             </div>
           </div>
 
-          <AlertErrorList formErrorList={formErrorList} onClose={close} />
-
           <div className='flex flex-row justify-center gap-2 flex-wrap my-6 px-4'>
+            {/* <div className='w-120'>
+              <div className='text-primary text-sm'>
+                {JSON.stringify(formik.values)}
+              </div>
+              <div className='text-error text-sm'>
+                {JSON.stringify(formik.errors)}
+              </div>
+            </div> */}
             {formType !== 'detail' && (
               <RequirePermission
                 permissions={
@@ -1084,7 +1174,7 @@ const ProjectFlockForm = ({
                   type='submit'
                   color='primary'
                   isLoading={formik.isSubmitting}
-                  disabled={formik.isSubmitting}
+                  disabled={!formik.isValid || formik.isSubmitting}
                   className='px-4 w-full'
                 >
                   <Icon icon='mdi:plus' width={24} height={24} />
@@ -1110,6 +1200,27 @@ const ProjectFlockForm = ({
           onClick: confirmationModalDeleteClickHandler,
         }}
       />
+
+      <ConfirmationModalWithNotes
+        ref={confirmModal.ref}
+        type={approvalAction == 'APPROVED' ? 'success' : 'error'}
+        text={`Apakah anda yakin ingin ${
+          approvalAction == 'APPROVED' ? 'approve' : 'reject'
+        } Project Flock berikut? (${initialValues?.flock_name} - ${
+          initialValues?.area?.name
+        })?`}
+        secondaryButton={{
+          text: 'Tidak',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: approvalAction == 'APPROVED' ? 'success' : 'error',
+          isLoading: isApproveLoading,
+          onClick: (notes) => {
+            confirmApprovalHandler(notes, approvalAction);
+          },
+        }}
+      />
     </>
   );
 };

src/components/pages/production/recording/RecordingTable.tsx

@@ -872,7 +872,7 @@ const RecordingTable = () => {
             'mb-20':
               isResponseSuccess(recordings) && recordings?.data?.length === 0,
           }),
-          tableWrapperClassName: 'overflow-x-auto min-h-full!',
+          tableWrapperClassName: 'overflow-x-auto min-h-full overflow-visible!',
           tableClassName: 'font-inter w-full table-auto min-h-full!',
           headerRowClassName: 'border-b border-b-gray-200',
           headerColumnClassName: