Merge branch 'development' into 'production'

refactor(FE): Refactor RowOptionsMenu to use PopoverButton and

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

src/app/finance/page.tsx

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

src/app/inventory/adjustment/page.tsx

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/app/production/recording/page.tsx

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

src/components/Drawer.tsx

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

src/components/Modal.tsx

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

src/components/Navbar.tsx

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

src/components/helper/ButtonFilter.tsx

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

src/components/input/DropFileInput.tsx

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

src/components/input/RadioInput.tsx

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

src/components/input/SelectInput.tsx

@@ -488,9 +488,11 @@ const SelectInput = <T extends OptionType>(props: SelectInputProps<T>) => {
         />
       )}
 
-      {isError && <p className='w-full text-sm text-error'>{errorMessage}</p>}
+      {isError && (
+        <p className='w-full mt-1.5 text-xs text-error'>{errorMessage}</p>
+      )}
       {!isError && bottomLabel && (
-        <p className='w-full text-sm opacity-60'>{bottomLabel}</p>
+        <p className='w-full mt-1.5 text-xs opacity-60'>{bottomLabel}</p>
       )}
     </div>
   );

src/components/input/TagInput.tsx

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

src/components/pages/closing/ClosingDetailTabs.tsx

@@ -18,7 +18,7 @@ import HppExpeditionClosingTab from '@/components/pages/closing/tab/HppExpeditio
 import ClosingKandangList from '@/components/pages/closing/ClosingKandangList';
 import { ProjectFlock } from '@/types/api/production/project-flock';
 import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
-import { useClosingTabStore } from '@/stores/closing/closing-tab.store';
+import { useTabActionsStore } from '@/stores/tab-actions/tab-actions.store';
 interface ClosingDetailProps {
   id: number;
   initialValue?: ClosingGeneralInformation;
@@ -33,7 +33,7 @@ const ClosingDetail: React.FC<ClosingDetailProps> = ({
   kandangData,
 }) => {
   const [activeTabId, setActiveTabId] = useState<string>('sapronak');
-  const tabActions = useClosingTabStore((state) => state.tabActions);
+  const tabActions = useTabActionsStore((state) => state.tabActions);
 
   const closingDetailTabs = useMemo(() => {
     const validTabs = [

src/components/pages/closing/ClosingsTable.tsx

@@ -1,6 +1,8 @@
 'use client';
 
 import { ChangeEventHandler, useEffect, useState, useMemo } from 'react';
+import { usePathname } from 'next/navigation';
+import { useUiStore } from '@/stores/ui/ui.store';
 import useSWR from 'swr';
 import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 import { useRouter } from 'next/navigation';
@@ -31,6 +33,7 @@ import {
   ClosingFilterType,
 } from '@/components/pages/closing/filter/ClosingFilter';
 import ClosingTableSkeleton from '@/components/pages/closing/skeleton/ClosingTableSkeleton';
+import ButtonFilter from '@/components/helper/ButtonFilter';
 
 const RowOptionsMenu = ({
   props,
@@ -90,6 +93,9 @@ const RowOptionsMenu = ({
 };
 
 const ClosingsTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   // ===== ROUTER =====
   const router = useRouter();
 
@@ -158,6 +164,7 @@ const ClosingsTable = () => {
     onReset: () => {
       updateFilter('location_id', '');
       updateFilter('project_status', '');
+      filterModal.closeModal();
     },
   });
 
@@ -287,25 +294,17 @@ const ClosingsTable = () => {
     );
   }, [formik.values.project_status, projectStatusOptions]);
 
-  // ===== ACTIVE FILTERS COUNT =====
+  useEffect(() => {
-  const activeFiltersCount = useMemo(() => {
+    updateFilter('search', searchValue);
-    let count = 0;
+  }, [searchValue, updateFilter]);
 
-    if (tableFilterState.location_id) {
+  useEffect(() => {
-      count += 1;
+    setTableState('closing-table', pathname);
-    }
+  }, [pathname, setTableState]);
-
-    if (tableFilterState.project_status) {
-      count += 1;
-    }
-
-    return count;
-  }, [tableFilterState.location_id, tableFilterState.project_status]);
-
-  const hasFilters = activeFiltersCount > 0;
 
   // ===== SEARCH CHANGE HANDLER =====
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    setSearchValue(e.target.value);
     updateFilter('search', e.target.value);
   };
 
@@ -352,25 +351,12 @@ const ClosingsTable = () => {
                 }}
               />
 
-              <Button
+              <ButtonFilter
-                variant='outline'
+                values={tableFilterState}
-                color='none'
+                excludeFields={['page', 'pageSize', 'search']}
                 onClick={handleFilterModalOpen}
-                className={cn(
+                className='px-3 py-2.5'
-                  'px-3 py-2.5 gap-1.5 text-sm text-base-content/50 border border-base-content/10 rounded-xl shadow-button-soft transition-all',
+              />
-                  {
-                    'border-primary-gradient text-primary': hasFilters,
-                  }
-                )}
-              >
-                <Icon icon='heroicons:funnel' width={20} height={20} />
-                Filter
-                {hasFilters && (
-                  <span className='w-5 h-5 text-white bg-[#FF3535] rounded-lg border border-base-300 flex items-center justify-center text-xs'>
-                    {activeFiltersCount}
-                  </span>
-                )}
-              </Button>
             </div>
           </div>
 
@@ -379,19 +365,19 @@ const ClosingsTable = () => {
               <span className='loading loading-spinner loading-xl' />
             </div>
           ) : data.length === 0 ? (
+            <div className='mt-3'>
               <ClosingTableSkeleton
                 columns={closingsColumns}
                 icon={
                   <Icon
-                  icon='heroicons:chart-bar'
+                    icon='heroicons:document-text'
                     className='text-white'
                     width={20}
                     height={20}
                   />
                 }
-              title='Data Closing Belum Tersedia'
-              subtitle='Tidak ada data closing untuk saat ini.'
               />
+            </div>
           ) : (
             <Table<Closing>
               data={isResponseSuccess(closings) ? closings?.data : []}
@@ -410,10 +396,7 @@ const ClosingsTable = () => {
               rowSelection={rowSelection}
               setRowSelection={setRowSelection}
               className={{
-                containerClassName: cn('mt-3', {
+                containerClassName: cn('mt-3 mb-0'),
-                  'w-full mb-0':
-                    isResponseSuccess(closings) && closings?.data?.length === 0,
-                }),
                 headerColumnClassName: 'text-nowrap',
               }}
             />

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

@@ -6,13 +6,13 @@ import { ColumnDef } from '@tanstack/react-table';
 const ClosingTableSkeleton = ({
   columns,
   icon,
-  title,
+  title = 'No Data Available',
-  subtitle,
+  subtitle = 'There is no closing data displayed. Enter closing data to get started.',
 }: {
   columns: ColumnDef<Closing>[];
   icon: React.ReactNode;
-  title: string;
+  title?: string;
-  subtitle: string;
+  subtitle?: string;
 }) => {
   return (
     <div className='relative size-full'>

src/components/pages/closing/table/SalesClosingTable.tsx

@@ -308,7 +308,16 @@ const SalesClosingTable = ({ projectFlockId }: SalesClosingTableProps) => {
       //   },
       // },
     ],
-    []
+    [
+      summary,
+      totals.avgActualPrice,
+      totals.avgSalesPrice,
+      totals.avgWeight,
+      totals.totalActualPrice,
+      totals.totalQuantity,
+      totals.totalSalesPrice,
+      totals.totalWeight,
+    ]
   );
 
   return (

src/components/pages/dashboard/DashboardProduction.tsx

@@ -150,15 +150,18 @@ const DashboardProduction = () => {
     },
   });
 
+  const { resetForm } = formik;
+
   const handleResetFilter = useCallback(() => {
-    formik.resetForm();
+    resetForm();
     resetFilterValues(); // Clear stored filter values
     setAnalysisMode('OVERVIEW');
     setEndpointUrl('/dashboards');
     setSelectedLocationIds([]);
-  }, [resetFilterValues, filterValues, selectedLocationIds]);
+  }, [resetForm, resetFilterValues]);
 
-  const handleApplyFilter = (values: DashboardFilter) => {
+  const handleApplyFilter = useCallback(
+    (values: DashboardFilter) => {
       // Build query params object, only include non-empty values
       const params: Record<string, string> = {};
 
@@ -171,12 +174,15 @@ const DashboardProduction = () => {
         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;
+      if (values.comparison_type)
+        params.comparison_type = values.comparison_type;
 
       setEndpointUrl(`/dashboards?${new URLSearchParams(params).toString()}`);
       filterModal.closeModal();
       refreshDashboardProductionData();
-  };
+    },
+    [filterModal, refreshDashboardProductionData]
+  );
 
   // ===== Load filter from store on mount =====
   useEffect(() => {
@@ -190,20 +196,20 @@ const DashboardProduction = () => {
       kandang_ids: normalizeToArray(filterValues.kandang),
       comparison_type: filterValues.comparisonType,
     });
-  }, [filterValues]);
+  }, [filterValues, handleApplyFilter]);
 
   // ===== Formik Error List =====
   const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
 
   // ===== Export PDF =====
-  const handleExportPDF = async () => {
+  const handleExportPDF = useCallback(async () => {
     await generateDashboardPDF({
       filterValues: formik.values,
       allStatsRef,
       allChartsRef,
       setExporting,
     });
-  };
+  }, [formik.values]);
 
   // ===== Register Navbar Actions =====
   const openFilterModalRef = useRef(filterModal.openModal);
@@ -253,7 +259,7 @@ const DashboardProduction = () => {
         </Dropdown>
       </div>
     );
-  }, [formik.values, exporting, setNavbarActions]);
+  }, [formik.values, exporting, setNavbarActions, handleExportPDF]);
 
   // Cleanup only on unmount
   useEffect(() => {

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

@@ -409,14 +409,14 @@ const DashboardLineChart = ({
               axisLine={{ stroke: '#C1C1C180', opacity: 0.5 }}
               domain={(() => {
                 // Calculate dynamic domain based on visible data
-                let seriesData: DashboardChartsSeries[] = [];
+                // let seriesData: DashboardChartsSeries[] = [];
                 let dataset: DashboardChartsDataset[] = [];
 
                 if (
                   analysisMode === 'OVERVIEW' &&
                   isOverviewCharts(data.charts)
                 ) {
-                  seriesData = data.charts[chartData]?.series || [];
+                  // seriesData = data.charts[chartData]?.series || [];
                   dataset = data.charts[chartData]?.dataset || [];
                 } else if (
                   analysisMode === 'COMPARISON' &&
@@ -426,7 +426,7 @@ const DashboardLineChart = ({
                     data.charts.farm ||
                     data.charts.flock ||
                     data.charts.kandang;
-                  seriesData = comparisonChart?.series || [];
+                  // seriesData = comparisonChart?.series || [];
                   dataset = comparisonChart?.dataset || [];
                 }
 

src/components/pages/expense/ExpensesTable.tsx

@@ -1,6 +1,8 @@
 'use client';
 
 import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
+import { usePathname } from 'next/navigation';
+import { useUiStore } from '@/stores/ui/ui.store';
 import useSWR from 'swr';
 import {
   CellContext,
@@ -16,41 +18,40 @@ import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import Button from '@/components/Button';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import SelectInput, {
+import PopoverButton from '@/components/popover/PopoverButton';
-  OptionType,
+import PopoverContent from '@/components/popover/PopoverContent';
-  useSelect,
-} from '@/components/input/SelectInput';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RealizationStatusBadge from '@/components/pages/expense/RealizationStatusBadge';
 import ExpenseStatusBadge from '@/components/pages/expense/ExpenseStatusBadge';
 import CheckboxInput from '@/components/input/CheckboxInput';
 import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
-import DateInput from '@/components/input/DateInput';
 import RequirePermission from '@/components/helper/RequirePermission';
+import ButtonFilter from '@/components/helper/ButtonFilter';
+import ExpensesFilterModal from '@/components/pages/expense/filter/ExpensesFilterModal';
+import ExpenseTableSkeleton from '@/components/pages/expense/skeleton/ExpenseTableSkeleton';
 
 import { Expense } from '@/types/api/expense';
 import { ExpenseApi } from '@/services/api/expense';
 import { cn, formatCurrency, formatDate } from '@/lib/helper';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { LocationApi, SupplierApi } from '@/services/api/master-data';
-import { Location } from '@/types/api/master-data/location';
-import { Supplier } from '@/types/api/master-data/supplier';
 import { BaseApiResponse } from '@/types/api/api-general';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Expense, unknown>;
-  approveClickHandler: () => void;
-  rejectClickHandler: () => void;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `expense#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-expense#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
   const showEditButton = props.row.original.latest_approval
     ? props.row.original.latest_approval.step_number !== 6 &&
       (props.row.original.latest_approval.step_number === 1 ||
@@ -59,23 +60,39 @@ const RowOptionsMenu = ({
         props.row.original.latest_approval.step_number === 4)
     : false;
 
-  // TODO: apply RBAC
   const showRealizationButton = props.row.original.latest_approval
     ? props.row.original.latest_approval.action !== 'REJECTED' &&
       props.row.original.latest_approval.step_number === 4
     : false;
 
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
-      <div className='w-full max-h-40 overflow-auto flex flex-col gap-1'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.expense.detail'>
             <Button
               href={`/expense/detail/?expenseId=${props.row.original.id}`}
               variant='ghost'
-            color='primary'
+              color='none'
-            className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-            <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
@@ -85,14 +102,11 @@ const RowOptionsMenu = ({
               <Button
                 href={`/expense/detail/edit/?expenseId=${props.row.original.id}`}
                 variant='ghost'
-              color='warning'
+                color='none'
-              className='justify-start text-sm'
+                className='p-3 justify-start text-sm font-semibold w-full'
+                onClick={closePopover}
               >
-              <Icon
+                <Icon icon='mdi:pencil-outline' width={20} height={20} />
-                icon='material-symbols:edit-outline'
-                width={16}
-                height={16}
-              />
                 Edit
               </Button>
             </RequirePermission>
@@ -103,13 +117,15 @@ const RowOptionsMenu = ({
               <Button
                 href={`/expense/realization/?expenseId=${props.row.original.id}`}
                 variant='ghost'
-              color='info'
+                color='none'
-              className='justify-start text-sm text-info focus-visible:text-info-content hover:text-info-content'
+                className='p-3 justify-start text-sm font-semibold w-full'
+                onClick={closePopover}
               >
                 <Icon
                   icon='material-symbols:money-bag-rounded'
-                width={16}
+                  width={20}
-                height={16}
+                  height={20}
+                  className='text-info'
                 />
                 Realisasi
               </Button>
@@ -118,26 +134,28 @@ const RowOptionsMenu = ({
 
           <RequirePermission permissions='lti.expense.delete'>
             <Button
-            onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
               color='error'
-            className='justify-start text-sm text-error focus-visible:text-error-content hover:text-error-content'
+              className='p-3 justify-start text-sm font-semibold w-full focus-visible:text-error-content hover:text-error-content'
             >
-            <Icon
+              <Icon icon='mdi:delete-outline' width={20} height={20} />
-              icon='material-symbols:delete-outline-rounded'
-              width={16}
-              height={16}
-              className='justify-start text-sm'
-            />
               Delete
             </Button>
           </RequirePermission>
         </div>
-    </RowOptionsMenuWrapper>
+      </PopoverContent>
+    </div>
   );
 };
 
 const ExpensesTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -179,6 +197,9 @@ const ExpensesTable = () => {
   const approveModal = useModal();
   const rejectModal = useModal();
 
+  // ===== FILTER MODAL STATE =====
+  const filterModal = useModal();
+
   const [selectedExpense, setSelectedExpense] = useState<Expense | undefined>(
     undefined
   );
@@ -340,31 +361,7 @@ const ExpensesTable = () => {
         const currentRowRelativeIndex =
           currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 3;
+        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-
-        const approveClickHandler = () => {
-          setSelectedExpense(props.row.original);
-
-          // Set row selection
-          setRowSelection({
-            [String(props.row.original.id)]: true,
-          });
-
-          setApprovalNotes('');
-          approveModal.openModal();
-        };
-
-        const rejectClickHandler = () => {
-          setSelectedExpense(props.row.original);
-
-          // Set row selection
-          setRowSelection({
-            [String(props.row.original.id)]: true,
-          });
-
-          setApprovalNotes('');
-          rejectModal.openModal();
-        };
 
         const deleteClickHandler = () => {
           setSelectedExpense(props.row.original);
@@ -372,31 +369,11 @@ const ExpensesTable = () => {
         };
 
         return (
-          <>
-            {currentPageSize > 3 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
           <RowOptionsMenu
-                  type='dropdown'
+            popoverPosition={isLast2Rows ? 'top' : 'bottom'}
             props={props}
-                  approveClickHandler={approveClickHandler}
-                  rejectClickHandler={rejectClickHandler}
             deleteClickHandler={deleteClickHandler}
           />
-              </RowDropdownOptions>
-            )}
-
-            {currentPageSize <= 3 && (
-              <RowCollapseOptions>
-                <RowOptionsMenu
-                  type='collapse'
-                  props={props}
-                  approveClickHandler={approveClickHandler}
-                  rejectClickHandler={rejectClickHandler}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowCollapseOptions>
-            )}
-          </>
         );
       },
     },
@@ -535,51 +512,41 @@ const ExpensesTable = () => {
     setIsRejectLoading(false);
   };
 
-  const {
+  useEffect(() => {
-    setInputValue: setLocationInputValue,
+    updateFilter('search', searchValue);
-    options: locationOptions,
+  }, [searchValue, updateFilter]);
-    isLoadingOptions: isLoadingLocationOptions,
-  } = useSelect<Location>(LocationApi.basePath, 'id', 'name');
 
-  const [selectedLocation, setSelectedLocation] = useState<OptionType | null>(
+  useEffect(() => {
-    null
+    setTableState('expense-table', pathname);
-  );
+  }, [pathname, setTableState]);
-
-  const locationChangeHandler = (val: OptionType | OptionType[] | null) => {
-    setSelectedLocation(val as OptionType);
-    updateFilter(
-      'locationId',
-      val ? ((val as OptionType).value as string) : ''
-    );
-  };
-
-  const {
-    setInputValue: setVendorInputValue,
-    options: vendorOptions,
-    isLoadingOptions: isLoadingVendorOptions,
-  } = useSelect<Supplier>(SupplierApi.basePath, 'id', 'name');
-
-  const [selectedVendor, setSelectedVendor] = useState<OptionType | null>(null);
-
-  const vendorChangeHandler = (val: OptionType | OptionType[] | null) => {
-    setSelectedVendor(val as OptionType);
-    updateFilter('vendorId', val ? ((val as OptionType).value as string) : '');
-  };
 
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    setSearchValue(e.target.value);
     updateFilter('search', e.target.value);
   };
 
-  const transactionDateChangeHandler: ChangeEventHandler<HTMLInputElement> = (
+  // ===== FILTER MODAL HANDLERS =====
-    e
+  const handleFilterModalOpen = () => {
-  ) => {
+    filterModal.openModal();
-    updateFilter('transactionDate', e.target.value);
   };
 
-  const realizationDateChangeHandler: ChangeEventHandler<HTMLInputElement> = (
+  const handleFilterSubmit = (values: {
-    e
+    transaction_date?: string | null;
-  ) => {
+    realization_date?: string | null;
-    updateFilter('realizationDate', e.target.value);
+    location_id?: string | null;
+    vendor_id?: string | null;
+  }) => {
+    updateFilter('transactionDate', values.transaction_date || '');
+    updateFilter('realizationDate', values.realization_date || '');
+    updateFilter('locationId', values.location_id || '');
+    updateFilter('vendorId', values.vendor_id || '');
+  };
+
+  const handleFilterReset = () => {
+    updateFilter('transactionDate', '');
+    updateFilter('realizationDate', '');
+    updateFilter('locationId', '');
+    updateFilter('vendorId', '');
   };
 
   // track sorting
@@ -595,16 +562,15 @@ const ExpensesTable = () => {
 
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-          <div className='flex flex-col gap-2 mb-4'>
+          {/* Action Buttons */}
-            <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-4'>
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
-              <div className='w-full sm:w-fit flex flex-col sm:flex-row self-start gap-2'>
             <RequirePermission permissions='lti.expense.create'>
               <Button
                 href='/expense/add'
                 color='primary'
-                    className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-xl shadow-button-soft'
               >
                 <Icon icon='heroicons:plus' width={20} height={20} />
                 Add Expense
@@ -613,15 +579,22 @@ const ExpensesTable = () => {
 
             {selectedRowIds.length > 0 && (
               <>
+                <hr className='w-px h-full border-none bg-base-content/10 sm:block hidden' />
+
                 <RequirePermission permissions='lti.expense.approve.head_area'>
                   <Button
                     variant='outline'
-                        color='info'
+                    color='none'
                     onClick={bulkApproveClickHandler}
                     disabled={!isAllSelectedRowLatestApprovalOnHeadArea}
-                        className='w-full sm:w-fit'
+                    className='px-3 py-2.5 gap-1.5 text-sm text-base-content/50 border border-base-content/10 rounded-xl shadow-button-soft'
                   >
-                        <Icon icon='lucide-lab:farm' width={24} height={24} />
+                    <Icon
+                      icon='lucide-lab:farm'
+                      width={20}
+                      height={20}
+                      className='text-success'
+                    />
                     Approve Head Area
                   </Button>
                 </RequirePermission>
@@ -629,14 +602,19 @@ const ExpensesTable = () => {
                 <RequirePermission permissions='lti.expense.approve.unit_vice_president'>
                   <Button
                     variant='outline'
-                        color='success'
+                    color='none'
                     onClick={bulkApproveClickHandler}
                     disabled={
                       !isAllSelectedRowLatestApprovalOnUnitVicePresident
                     }
-                        className='w-full sm:w-fit'
+                    className='px-3 py-2.5 gap-1.5 text-sm text-base-content/50 border border-base-content/10 rounded-xl shadow-button-soft'
                   >
-                        <Icon icon='tdesign:money' width={24} height={24} />
+                    <Icon
+                      icon='tdesign:money'
+                      width={20}
+                      height={20}
+                      className='text-success'
+                    />
                     Approve Unit Vice President
                   </Button>
                 </RequirePermission>
@@ -644,12 +622,17 @@ const ExpensesTable = () => {
                 <RequirePermission permissions='lti.expense.approve.finance'>
                   <Button
                     variant='outline'
-                        color='success'
+                    color='none'
                     onClick={bulkApproveClickHandler}
                     disabled={!isAllSelectedRowLatestApprovalOnFinance}
-                        className='w-full sm:w-fit'
+                    className='px-3 py-2.5 gap-1.5 text-sm text-base-content/50 border border-base-content/10 rounded-xl shadow-button-soft'
                   >
-                        <Icon icon='tdesign:money' width={24} height={24} />
+                    <Icon
+                      icon='tdesign:money'
+                      width={20}
+                      height={20}
+                      className='text-success'
+                    />
                     Approve Finance
                   </Button>
                 </RequirePermission>
@@ -663,19 +646,20 @@ const ExpensesTable = () => {
                 >
                   <Button
                     variant='outline'
-                        color='error'
+                    color='none'
                     onClick={bulkRejectClickHandler}
                     disabled={
                       !isAllSelectedRowLatestApprovalOnHeadArea &&
                       !isAllSelectedRowLatestApprovalOnUnitVicePresident &&
                       !isAllSelectedRowLatestApprovalOnFinance
                     }
-                        className='w-full sm:w-fit'
+                    className='px-3 py-2.5 gap-1.5 text-sm text-base-content/50 border border-base-content/10 rounded-xl shadow-button-soft'
                   >
                     <Icon
                       icon='material-symbols:close'
-                          width={24}
+                      width={20}
-                          height={24}
+                      height={20}
+                      className='text-error'
                     />
                     Reject
                   </Button>
@@ -683,70 +667,65 @@ const ExpensesTable = () => {
               </>
             )}
           </div>
-            </div>
-
-            <div className='grid grid-cols-12 justify-end gap-2'>
-              <DateInput
-                required
-                label='Tanggal Transaksi'
-                name='transaction_date'
-                placeholder='Masukkan tanggal transaksi'
-                value={tableFilterState.transactionDate}
-                onChange={transactionDateChangeHandler}
-                className={{
-                  wrapper: 'col-span-12 sm:col-span-3',
-                }}
-              />
-
-              <DateInput
-                required
-                label='Tanggal Realisasi'
-                name='realization_date'
-                placeholder='Masukkan tanggal realisasi'
-                value={tableFilterState.realizationDate}
-                onChange={realizationDateChangeHandler}
-                className={{
-                  wrapper: 'col-span-12 sm:col-span-3',
-                }}
-              />
-
-              <SelectInput
-                label='Lokasi'
-                options={locationOptions}
-                isLoading={isLoadingLocationOptions}
-                value={selectedLocation}
-                onChange={locationChangeHandler}
-                onInputChange={setLocationInputValue}
-                isClearable
-                className={{
-                  wrapper: 'col-span-12 sm:col-span-3',
-                }}
-              />
-
-              <SelectInput
-                label='Vendor'
-                options={vendorOptions}
-                isLoading={isLoadingVendorOptions}
-                value={selectedVendor}
-                onChange={vendorChangeHandler}
-                onInputChange={setVendorInputValue}
-                isClearable
-                className={{
-                  wrapper: 'col-span-12 sm:col-span-3',
-                }}
-              />
 
+          {/* Search and Filter */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-                placeholder='Cari Biaya Operasional'
+              placeholder='Search'
-                value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-                className={{ wrapper: 'col-span-12 max-w-52 justify-self-end' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
+                />
+              }
+              className={{
+                wrapper: 'w-full min-w-24 max-w-3xs',
+                inputWrapper: 'rounded-xl! shadow-button-soft',
+                input:
+                  'placeholder:font-semibold placeholder:text-base-content/50',
+              }}
+            />
+
+            <ButtonFilter
+              values={tableFilterState}
+              excludeFields={[
+                'page',
+                'pageSize',
+                'search',
+                'nameSort',
+                'userId',
+              ]}
+              onClick={handleFilterModalOpen}
+              className='px-3 py-2.5'
             />
           </div>
         </div>
-        </div>
 
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(expenses) || expenses.data?.length === 0 ? (
+            <div className='p-3'>
+              <ExpenseTableSkeleton
+                columns={expensesColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<Expense>
               data={isResponseSuccess(expenses) ? expenses?.data : []}
               columns={expensesColumns}
@@ -756,6 +735,7 @@ const ExpensesTable = () => {
                 isResponseSuccess(expenses) ? expenses?.meta?.total_results : 0
               }
               onPageChange={setPage}
+              onPageSizeChange={setPageSize}
               isLoading={isLoading}
               sorting={sorting}
               setSorting={setSorting}
@@ -763,20 +743,12 @@ const ExpensesTable = () => {
               setRowSelection={setRowSelection}
               enableRowSelection={tableEnableRowSelectionHandler}
               className={{
-            containerClassName: cn({
+                containerClassName: cn('p-3 mb-0'),
-              'mb-20':
+                headerColumnClassName: 'text-nowrap',
-                isResponseSuccess(expenses) && expenses?.data?.length === 0,
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
+        </div>
       </div>
 
       <ConfirmationModal
@@ -831,6 +803,12 @@ const ExpensesTable = () => {
           onClick: confirmationModalRejectClickHandler,
         }}
       />
+
+      <ExpensesFilterModal
+        ref={filterModal.ref}
+        onSubmit={handleFilterSubmit}
+        onReset={handleFilterReset}
+      />
     </>
   );
 };

src/components/pages/expense/filter/ExpensesFilter.ts

@@ -0,0 +1,28 @@
+import * as yup from 'yup';
+
+export type ExpensesFilterType = {
+  transaction_date: string | null;
+  realization_date: string | null;
+  location_id: string | null;
+  vendor_id: string | null;
+};
+
+export const ExpensesFilterSchema = yup.object({
+  transaction_date: yup.string().nullable(),
+  realization_date: yup
+    .string()
+    .nullable()
+    .test(
+      'is-greater-or-equal-transaction',
+      'Tanggal realisasi tidak boleh sebelum tanggal transaksi',
+      function (value) {
+        const { transaction_date } = this.parent;
+        if (!transaction_date || !value) return true;
+        return new Date(value) >= new Date(transaction_date);
+      }
+    ),
+  location_id: yup.string().nullable(),
+  vendor_id: yup.string().nullable(),
+});
+
+export type ExpensesFilterValues = yup.InferType<typeof ExpensesFilterSchema>;

src/components/pages/expense/filter/ExpensesFilterModal.tsx

@@ -0,0 +1,209 @@
+'use client';
+
+import { RefObject } from 'react';
+import { useFormik } from 'formik';
+
+import { Icon } from '@iconify/react';
+import Modal from '@/components/Modal';
+import Button from '@/components/Button';
+import DateInput from '@/components/input/DateInput';
+import SelectInput from '@/components/input/SelectInput';
+
+import { OptionType, useSelect } from '@/components/input/SelectInput';
+import { LocationApi, SupplierApi } from '@/services/api/master-data';
+import { Location } from '@/types/api/master-data/location';
+import { Supplier } from '@/types/api/master-data/supplier';
+import {
+  ExpensesFilterSchema,
+  ExpensesFilterValues,
+} from '@/components/pages/expense/filter/ExpensesFilter';
+
+interface ExpensesFilterModalProps {
+  ref: RefObject<HTMLDialogElement | null>;
+  initialValues?: ExpensesFilterValues;
+  onSubmit?: (values: Partial<ExpensesFilterValues>) => void;
+  onReset?: () => void;
+}
+
+const ExpensesFilterModal = ({
+  ref,
+  initialValues,
+  onSubmit,
+  onReset,
+}: ExpensesFilterModalProps) => {
+  const closeModalHandler = () => {
+    ref.current?.close();
+  };
+
+  const {
+    setInputValue: setLocationInputValue,
+    options: locationOptions,
+    isLoadingOptions: isLoadingLocationOptions,
+  } = useSelect<Location>(LocationApi.basePath, 'id', 'name');
+
+  const {
+    setInputValue: setVendorInputValue,
+    options: vendorOptions,
+    isLoadingOptions: isLoadingVendorOptions,
+  } = useSelect<Supplier>(SupplierApi.basePath, 'id', 'name');
+
+  const formik = useFormik<ExpensesFilterValues>({
+    initialValues: initialValues || {
+      transaction_date: null,
+      realization_date: null,
+      location_id: null,
+      vendor_id: null,
+    },
+    validationSchema: ExpensesFilterSchema,
+    onSubmit: async (values) => {
+      onSubmit?.(values);
+      closeModalHandler();
+    },
+    onReset: () => {
+      onReset?.();
+      closeModalHandler();
+    },
+  });
+
+  const locationValue = formik.values.location_id
+    ? locationOptions.find(
+        (opt) => String(opt.value) === formik.values.location_id
+      ) || null
+    : null;
+
+  const vendorValue = formik.values.vendor_id
+    ? vendorOptions.find(
+        (opt) => String(opt.value) === formik.values.vendor_id
+      ) || null
+    : null;
+
+  const locationChangeHandler = (val: OptionType | OptionType[] | null) => {
+    const locationId =
+      val && !Array.isArray(val) ? (String(val.value) as string) : null;
+    formik.setFieldValue('location_id', locationId);
+  };
+
+  const vendorChangeHandler = (val: OptionType | OptionType[] | null) => {
+    const vendorId =
+      val && !Array.isArray(val) ? (String(val.value) as string) : null;
+    formik.setFieldValue('vendor_id', vendorId);
+  };
+
+  return (
+    <Modal
+      ref={ref}
+      className={{
+        modalBox: 'p-0 rounded-xl xl:max-w-4/12 max-w-sm',
+      }}
+    >
+      <form
+        onSubmit={formik.handleSubmit}
+        onReset={formik.handleReset}
+        className='w-full flex flex-col'
+      >
+        {/* Modal Header */}
+        <div className='p-4 flex items-center justify-between gap-2 border-b border-base-content/10'>
+          <div className='flex items-center gap-2 text-primary'>
+            <Icon icon='heroicons:funnel' width={20} height={20} />
+            <h3 className='text-sm font-medium'>Filter Data</h3>
+          </div>
+
+          <Button
+            type='button'
+            variant='ghost'
+            color='none'
+            onClick={closeModalHandler}
+            className='p-0 text-base-content/50 hover:text-base-content'
+          >
+            <Icon icon='heroicons:x-mark' width={20} height={20} />
+          </Button>
+        </div>
+
+        {/* Modal Body */}
+        <div className='p-4 flex flex-col gap-1.5'>
+          <div className='flex flex-col'>
+            <span className='py-2 text-xs font-semibold'>Tanggal</span>
+            <div className='flex flex-row items-center gap-1.5'>
+              <DateInput
+                name='transaction_date'
+                placeholder='Tanggal Transaksi'
+                value={formik.values.transaction_date || ''}
+                onChange={formik.handleChange}
+                onBlur={formik.handleBlur}
+                isError={
+                  formik.touched.transaction_date &&
+                  !!formik.errors.transaction_date
+                }
+              />
+              <hr className='w-full max-w-3 h-px border-base-content/10' />
+              <DateInput
+                name='realization_date'
+                placeholder='Tanggal Realisasi'
+                value={formik.values.realization_date || ''}
+                onChange={formik.handleChange}
+                onBlur={formik.handleBlur}
+                isError={
+                  formik.touched.realization_date &&
+                  !!formik.errors.realization_date
+                }
+              />
+            </div>
+            {formik.touched.realization_date &&
+              formik.errors.realization_date && (
+                <span className='text-xs text-error'>
+                  {formik.errors.realization_date}
+                </span>
+              )}
+          </div>
+
+          <SelectInput
+            label='Lokasi'
+            placeholder='Pilih Lokasi'
+            options={locationOptions}
+            value={locationValue}
+            onChange={locationChangeHandler}
+            onInputChange={setLocationInputValue}
+            isLoading={isLoadingLocationOptions}
+            isClearable
+            isSearchable={true}
+            className={{ wrapper: 'w-full' }}
+          />
+
+          <SelectInput
+            label='Vendor'
+            placeholder='Pilih Vendor'
+            options={vendorOptions}
+            value={vendorValue}
+            onChange={vendorChangeHandler}
+            onInputChange={setVendorInputValue}
+            isLoading={isLoadingVendorOptions}
+            isClearable
+            isSearchable={true}
+            className={{ wrapper: 'w-full' }}
+          />
+        </div>
+
+        {/* Modal Footer */}
+        <div className='p-4 flex justify-between gap-4 border-t border-base-content/10 bg-gray-50'>
+          <Button
+            type='reset'
+            variant='soft'
+            className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
+          >
+            Reset Filter
+          </Button>
+
+          <Button
+            type='submit'
+            className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
+            disabled={!formik.isValid || formik.isSubmitting}
+          >
+            Apply Filter
+          </Button>
+        </div>
+      </form>
+    </Modal>
+  );
+};
+
+export default ExpensesFilterModal;

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import useSWR from 'swr';
 
 import { Icon } from '@iconify/react';
@@ -75,6 +75,12 @@ const ExpenseKandangsTable = ({
         .filter((id): id is number => id !== undefined)
     )
   );
+  const rowSelectionRef = useRef(rowSelection);
+  const prevRowSelectionRef = useRef<Record<string, boolean>>({});
+
+  useEffect(() => {
+    rowSelectionRef.current = rowSelection;
+  }, [rowSelection]);
 
   const kandangsColumns: ColumnDef<Kandang>[] = [
     {
@@ -133,10 +139,19 @@ const ExpenseKandangsTable = ({
 
   useEffect(() => {
     setOpen(isResponseSuccess(kandangs) ? kandangs.data.length > 0 : false);
-  }, [kandangs, isResponseSuccess]);
+  }, [kandangs]);
 
   useEffect(() => {
-    if (Object.keys(rowSelection).length !== 0 && isResponseSuccess(kandangs)) {
+    const currentKeys = Object.keys(rowSelection).sort().join(',');
+    const prevKeys = Object.keys(prevRowSelectionRef.current).sort().join(',');
+
+    if (currentKeys !== prevKeys) {
+      prevRowSelectionRef.current = { ...rowSelection };
+
+      if (
+        Object.keys(rowSelection).length !== 0 &&
+        isResponseSuccess(kandangs)
+      ) {
         const formattedSelectedKandangs = Object.keys(rowSelection).map(
           (item) => {
             const selectedKandang = kandangs.data.find(
@@ -151,15 +166,16 @@ const ExpenseKandangsTable = ({
         );
 
         onChange(formattedSelectedKandangs);
-    } else {
+      } else if (Object.keys(rowSelection).length === 0) {
         onChange([]);
       }
-  }, [rowSelection]);
+    }
+  }, [rowSelection, kandangs, onChange]);
 
   useEffect(() => {
     if (
       selectedKandangs.length === 0 &&
-      Object.keys(rowSelection).length !== 0
+      Object.keys(rowSelectionRef.current).length !== 0
     ) {
       setRowSelection({});
     }

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useState } from 'react';
 import { useRouter } from 'next/navigation';
 import { useFormik } from 'formik';
 import toast from 'react-hot-toast';
@@ -90,6 +90,7 @@ const ExpenseRealizationForm = ({
 
   const formik = useFormik<ExpenseRealizationFormValues>({
     initialValues: getExpenseRealizationFormInitialValues(initialValues),
+    enableReinitialize: true,
     validationSchema:
       type === 'edit'
         ? UpdateExpenseRealizationFormSchema
@@ -143,7 +144,6 @@ const ExpenseRealizationForm = ({
     },
   });
 
-  const { setValues: formikSetValues } = formik;
   const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
 
   const {
@@ -254,10 +254,6 @@ const ExpenseRealizationForm = ({
     formik.setFieldValue('documents', newRequestDocuments);
   };
 
-  useEffect(() => {
-    formikSetValues(getExpenseRealizationFormInitialValues(initialValues));
-  }, [formikSetValues, getExpenseRealizationFormInitialValues, initialValues]);
-
   return (
     <section className='w-full'>
       <header className='flex flex-col gap-4'>

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useState } from 'react';
 import { useRouter } from 'next/navigation';
 import { useFormik } from 'formik';
 import { toast } from 'react-hot-toast';
@@ -102,6 +102,7 @@ const ExpenseRequestForm = ({
 
   const formik = useFormik<ExpenseRequestFormValues>({
     initialValues: getExpenseFormInitialValues(initialValues),
+    enableReinitialize: true,
     validationSchema:
       type === 'edit'
         ? UpdateExpenseRequestFormSchema
@@ -171,7 +172,7 @@ const ExpenseRequestForm = ({
     },
   });
 
-  const { setValues: formikSetValues } = formik;
+  const { setFieldValue, setFieldTouched } = formik;
 
   const {
     setInputValue: setLocationInputValue,
@@ -186,8 +187,8 @@ const ExpenseRequestForm = ({
   } = useSelect<Supplier>(SupplierApi.basePath, 'id', 'name');
 
   const categoryChangeHandler = (val: OptionType | OptionType[] | null) => {
-    formik.setFieldTouched('category', true);
+    setFieldTouched('category', true);
-    formik.setFieldValue('category', val);
+    setFieldValue('category', val);
   };
 
   const locationChangeHandler = useCallback(
@@ -195,12 +196,12 @@ const ExpenseRequestForm = ({
       const location = val as OptionType | null;
       const locationId = location ? Number(location.value) : 0;
 
-      formik.setFieldTouched('location', true);
+      setFieldTouched('location', true);
-      formik.setFieldValue('location', location);
+      setFieldValue('location', location);
-      formik.setFieldTouched('location_id', true);
+      setFieldTouched('location_id', true);
-      formik.setFieldValue('location_id', locationId);
+      setFieldValue('location_id', locationId);
     },
-    []
+    [setFieldTouched, setFieldValue]
   );
 
   const kandangsChangeHandler = (
@@ -343,10 +344,6 @@ const ExpenseRequestForm = ({
     formik.handleSubmit(e);
   };
 
-  useEffect(() => {
-    formikSetValues(getExpenseFormInitialValues(initialValues));
-  }, [formikSetValues, getExpenseFormInitialValues, initialValues]);
-
   return (
     <>
       <section className='w-full'>

src/components/pages/expense/skeleton/ExpenseTableSkeleton.tsx

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

src/components/pages/finance/FinanceDetail.tsx

@@ -2,7 +2,6 @@ import Button from '@/components/Button';
 import Card from '@/components/Card';
 import { FormHeader } from '@/components/helper/form/FormHeader';
 import RequirePermission from '@/components/helper/RequirePermission';
-import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import Table from '@/components/Table';
@@ -26,11 +25,13 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
   const informasiUmum = [
     {
       label: 'ID',
-      value: finance.payment_code,
+      value: finance.payment_code || '-',
     },
     {
       label: 'Jenis Transaksi',
-      value: formatTitleCase(finance.transaction_type.split('_').join(' ')),
+      value: formatTitleCase(
+        (finance.transaction_type || '').split('_').join(' ')
+      ),
     },
     {
       label: 'Pihak',
@@ -38,11 +39,13 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
     },
     {
       label: 'Tanggal',
-      value: formatDate(finance.payment_date, 'DD MMM yyyy'),
+      value: finance.payment_date
+        ? formatDate(finance.payment_date, 'DD MMM yyyy')
+        : '-',
     },
     {
       label: 'Metode Pembayaran',
-      value: finance.payment_method,
+      value: finance.payment_method || '-',
     },
     {
       label: 'Catatan',
@@ -61,22 +64,22 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
         : '-',
     },
     {
-      label: `Rekening ${formatTitleCase(finance.party?.type)}`,
+      label: `Rekening ${formatTitleCase(finance.party?.type || '')}`,
-      value: finance.party?.account_number,
+      value: finance.party?.account_number || '-',
     },
     {
       label: 'Nominal',
       value: formatCurrency(
         finance.transaction_type === 'INJECTION'
-          ? finance.nominal
+          ? finance.nominal || 0
-          : Math.abs(finance.nominal)
+          : Math.abs(finance.nominal || 0)
       ),
     },
   ].filter((item) => {
     // Hide party account number row if transaction type is INJECTION
     if (
-      FINANCE_INJECTION_STATUS.includes(finance.transaction_type) &&
+      FINANCE_INJECTION_STATUS.includes(finance.transaction_type || '') &&
-      item.label === `Rekening ${formatTitleCase(finance.party?.type)}`
+      item.label === `Rekening ${formatTitleCase(finance.party?.type || '')}`
     ) {
       return false;
     }
@@ -150,7 +153,7 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
       </Card>
 
       <div className='flex flex-row gap-2 justify-end'>
-        {FINANCE_TRANSACTION_STATUS.includes(finance.transaction_type) &&
+        {FINANCE_TRANSACTION_STATUS.includes(finance.transaction_type || '') &&
           finance.party?.type !== 'SUPPLIER' && (
             <RequirePermission permissions='lti.finance.payments.update'>
               <Button
@@ -163,7 +166,9 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
               </Button>
             </RequirePermission>
           )}
-        {FINANCE_INITIAL_BALANCE_STATUS.includes(finance.transaction_type) && (
+        {FINANCE_INITIAL_BALANCE_STATUS.includes(
+          finance.transaction_type || ''
+        ) && (
           <RequirePermission permissions='lti.finance.initial_balances.update'>
             <Button
               color='warning'
@@ -175,7 +180,7 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
             </Button>
           </RequirePermission>
         )}
-        {FINANCE_INJECTION_STATUS.includes(finance.transaction_type) && (
+        {FINANCE_INJECTION_STATUS.includes(finance.transaction_type || '') && (
           <RequirePermission permissions='lti.finance.injections.update'>
             <Button
               color='warning'
@@ -201,7 +206,7 @@ const FinanceDetail = ({ finance }: { finance: Finance }) => {
       <ConfirmationModal
         ref={deleteModal.ref}
         type='error'
-        text={`Apakah anda yakin ingin menghapus data Finance ini (${finance?.payment_code})?`}
+        text={`Apakah anda yakin ingin menghapus data Finance ini (${finance?.payment_code || ''})?`}
         secondaryButton={{
           text: 'Tidak',
         }}

src/components/pages/finance/FinanceTable.tsx

@@ -1,10 +1,19 @@
-import { useEffect, useMemo, useRef, useState } from 'react';
+'use client';
-import { CellContext } from '@tanstack/react-table';
+
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
+import { CellContext, ColumnDef } from '@tanstack/react-table';
 import useSWR from 'swr';
+import { Icon } from '@iconify/react';
 import { useFormik } from 'formik';
+import { cn, formatCurrency, formatDate, formatTitleCase } from '@/lib/helper';
 
 import Button from '@/components/Button';
-import Card from '@/components/Card';
 import DateInput from '@/components/input/DateInput';
 import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import SelectInput, {
@@ -12,7 +21,6 @@ import SelectInput, {
   useSelect,
 } from '@/components/input/SelectInput';
 import Table from '@/components/Table';
-import { formatCurrency, formatDate, formatTitleCase } from '@/lib/helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
 import { Finance } from '@/types/api/finance/finance';
 import {
@@ -25,31 +33,57 @@ import { FinanceApi } from '@/services/api/finance';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { BankApi, CustomerApi, SupplierApi } from '@/services/api/master-data';
 import { Bank } from '@/types/api/master-data/bank';
-import { useModal } from '@/components/Modal';
+import Modal, { useModal } from '@/components/Modal';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import toast from 'react-hot-toast';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RequirePermission from '@/components/helper/RequirePermission';
-import { Icon } from '@iconify/react';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
 import { useUiStore } from '@/stores/ui/ui.store';
 import {
   FinanceTableFilterSchema,
   FinanceTableFilterValues,
-} from './FinanceTableFilter.schema';
+} from '@/components/pages/finance/filter/FinanceFilter';
+import FinanceTableSkeleton from '@/components/pages/finance/skeleton/FinanceTableSkeleton';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Finance, unknown>;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `finance#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-finance#${props.row.original.id}`;
+
+  const closePopover = () => {
+    const popover = document.getElementById(popoverId) as
+      | HTMLDivElement
+      | undefined;
+    popover?.hidePopover?.();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission
             permissions={[
               'lti.finance.transactions.detail',
@@ -61,10 +95,11 @@ const RowOptionsMenu = ({
             <Button
               href={`/finance/detail?financeId=${props.row.original.id}`}
               variant='ghost'
-          color='primary'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
@@ -76,10 +111,11 @@ const RowOptionsMenu = ({
               <Button
                 href={`/finance/detail/edit?financeId=${props.row.original.id}`}
                 variant='ghost'
-            color='warning'
+                color='none'
-            className='justify-start text-sm'
+                className='p-3 justify-start text-sm font-semibold w-full'
+                onClick={closePopover}
               >
-            <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+                <Icon icon='mdi:pencil-outline' width={20} height={20} />
                 Edit
               </Button>
             </RequirePermission>
@@ -92,10 +128,11 @@ const RowOptionsMenu = ({
               <Button
                 href={`/finance/detail/edit/initial-balance?financeId=${props.row.original.id}`}
                 variant='ghost'
-            color='warning'
+                color='none'
-            className='justify-start text-sm'
+                className='p-3 justify-start text-sm font-semibold w-full'
+                onClick={closePopover}
               >
-            <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+                <Icon icon='mdi:pencil-outline' width={20} height={20} />
                 Edit
               </Button>
             </RequirePermission>
@@ -108,10 +145,11 @@ const RowOptionsMenu = ({
               <Button
                 href={`/finance/detail/edit/injection?financeId=${props.row.original.id}`}
                 variant='ghost'
-            color='warning'
+                color='none'
-            className='justify-start text-sm'
+                className='p-3 justify-start text-sm font-semibold w-full'
+                onClick={closePopover}
               >
-            <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+                <Icon icon='mdi:pencil-outline' width={20} height={20} />
                 Edit
               </Button>
             </RequirePermission>
@@ -119,21 +157,21 @@ const RowOptionsMenu = ({
 
           <RequirePermission permissions='lti.finance.transactions.delete'>
             <Button
-          onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
               color='error'
-          className='text-error hover:text-inherit'
+              className='p-3 justify-start text-sm font-semibold w-full focus-visible:text-error-content hover:text-error-content'
             >
-          <Icon
+              <Icon icon='mdi:delete-outline' width={20} height={20} />
-            icon='material-symbols:delete-outline-rounded'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Delete
             </Button>
           </RequirePermission>
-    </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
@@ -171,6 +209,9 @@ const FinanceTable = () => {
     },
   });
 
+  // ===== FILTER MODAL STATE =====
+  const filterModal = useModal();
+
   // ===== State =====
   const deleteModal = useModal();
   const [selectedTransactionType, setSelectedTransactionType] = useState<
@@ -189,6 +230,7 @@ const FinanceTable = () => {
   const [selectedFinance, setSelectedFinance] = useState<Finance | null>(null);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
   const [dateErrorShown, setDateErrorShown] = useState(false);
+  const [hasDateError, setHasDateError] = useState(false);
 
   // ===== Formik for Filter =====
   const filterFormik = useFormik<FinanceTableFilterValues>({
@@ -214,6 +256,18 @@ const FinanceTable = () => {
       updateFilter('sortBy', values.sort_by);
       updateFilter('startDate', values.start_date);
       updateFilter('endDate', values.end_date);
+      filterModal.closeModal();
+    },
+    onReset: () => {
+      updateFilter('search', '');
+      resetSearchValue();
+      updateFilter('transactionTypes', '');
+      updateFilter('bankIds', '');
+      updateFilter('customerIds', '');
+      updateFilter('supplierIds', '');
+      updateFilter('sortBy', '');
+      updateFilter('startDate', '');
+      updateFilter('endDate', '');
     },
   });
 
@@ -266,10 +320,41 @@ const FinanceTable = () => {
     });
   }, [bankOptions, bankRawData]);
 
+  // ===== ACTIVE FILTERS COUNT =====
+  const activeFiltersCount = useMemo(() => {
+    let count = 0;
+
+    if (tableFilterState.transactionTypes) count += 1;
+    if (tableFilterState.bankIds) count += 1;
+    if (tableFilterState.customerIds) count += 1;
+    if (tableFilterState.supplierIds) count += 1;
+    if (tableFilterState.sortBy) count += 1;
+    if (tableFilterState.startDate) count += 1;
+    if (tableFilterState.endDate) count += 1;
+
+    return count;
+  }, [
+    tableFilterState.transactionTypes,
+    tableFilterState.bankIds,
+    tableFilterState.customerIds,
+    tableFilterState.supplierIds,
+    tableFilterState.sortBy,
+    tableFilterState.startDate,
+    tableFilterState.endDate,
+  ]);
+
+  const hasFilters = activeFiltersCount > 0;
+
   // ===== Handler =====
-  const searchChangeHandler = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const searchChangeHandler = useCallback(
-    filterFormik.setFieldValue('search', e.target.value);
+    (e: React.ChangeEvent<HTMLInputElement>) => {
-  };
+      updateFilter('search', e.target.value);
+      setSearchValue(e.target.value);
+      setPage(1);
+    },
+    [updateFilter, setSearchValue, setPage]
+  );
+
   const transactionTypeChangeHandler = (
     val: OptionType | OptionType[] | null
   ) => {
@@ -335,10 +420,7 @@ const FinanceTable = () => {
       const endDateObj = new Date(endDate);
 
       if (endDateObj < startDate) {
-        filterFormik.setFieldError(
+        setHasDateError(true);
-          'end_date',
-          'Tanggal akhir tidak boleh masa lampau'
-        );
         if (!dateErrorShown) {
           toast.error('Tanggal akhir tidak boleh masa lampau', {
             duration: Infinity,
@@ -346,12 +428,14 @@ const FinanceTable = () => {
           setDateErrorShown(true);
         }
       } else {
-        filterFormik.setFieldError('end_date', undefined);
+        setHasDateError(false);
         if (dateErrorShown) {
           toast.dismiss();
           setDateErrorShown(false);
         }
       }
+    } else {
+      setHasDateError(false);
     }
   };
 
@@ -366,10 +450,7 @@ const FinanceTable = () => {
       const endDate = new Date(value);
 
       if (endDate < startDateObj) {
-        filterFormik.setFieldError(
+        setHasDateError(true);
-          'end_date',
-          'Tanggal akhir tidak boleh masa lampau'
-        );
         if (!dateErrorShown) {
           toast.error('Tanggal akhir tidak boleh masa lampau', {
             duration: Infinity,
@@ -380,13 +461,18 @@ const FinanceTable = () => {
       }
     }
 
-    filterFormik.setFieldError('end_date', undefined);
+    setHasDateError(false);
     if (dateErrorShown) {
       toast.dismiss();
       setDateErrorShown(false);
     }
   };
 
+  const handleFilterModalOpen = () => {
+    filterModal.openModal();
+    filterFormik.validateForm();
+  };
+
   const resetFilterHandler = () => {
     setSelectedTransactionType(null);
     setSelectedBank(null);
@@ -406,6 +492,7 @@ const FinanceTable = () => {
     updateFilter('startDate', '');
     updateFilter('endDate', '');
   };
+
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
@@ -417,8 +504,8 @@ const FinanceTable = () => {
     setIsDeleteLoading(false);
   };
 
-  const columns = useMemo(() => {
+  const columns: ColumnDef<Finance>[] = useMemo(
-    return [
+    () => [
       {
         header: 'ID',
         accessorKey: 'payment_code',
@@ -498,32 +585,17 @@ const FinanceTable = () => {
           };
 
           return (
-            <>
-              {currentPageSize > 2 && (
-                <RowDropdownOptions isLast2Rows={isLast2Rows}>
             <RowOptionsMenu
-                    type='dropdown'
               props={props}
               deleteClickHandler={deleteClickHandler}
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
             />
-                </RowDropdownOptions>
-              )}
-
-              {currentPageSize <= 2 && (
-                <RowCollapseOptions>
-                  <RowOptionsMenu
-                    type='collapse'
-                    props={props}
-                    deleteClickHandler={deleteClickHandler}
-                  />
-                </RowCollapseOptions>
-              )}
-            </>
           );
         },
       },
-    ];
+    ],
-  }, []);
+    [deleteModal]
+  );
 
   useEffect(() => {
     return () => {
@@ -555,69 +627,202 @@ const FinanceTable = () => {
   }, [resetSearchValue, dateErrorShown]);
 
   return (
-    <section className='size-full flex flex-col gap-6'>
+    <>
-      <div className='flex justify-end gap-2'>
+      <div className='w-full'>
+        {/* Header Section */}
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
+          {/* Action Buttons */}
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.finance.injections.create'>
               <Button
-            color='warning'
-            className='min-w-24'
                 href='/finance/add/injection'
+                color='warning'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-            Injection Saldo Bank
+                <Icon icon='mdi:bank-transfer-in' width={20} height={20} />
+                Add Injection (Saldo Bank)
               </Button>
             </RequirePermission>
             <RequirePermission permissions='lti.finance.initial_balances.create'>
               <Button
-            color='info'
-            className='text-white min-w-24'
                 href='/finance/add/initial-balance'
+                color='info'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-            Saldo Awal
+                <Icon icon='mdi:cash-register' width={20} height={20} />
+                Add Initial Balance
               </Button>
             </RequirePermission>
             <RequirePermission permissions='lti.finance.payments.create'>
-          <Button color='primary' className='min-w-24' href='/finance/add'>
+              <Button
-            Tambah
+                href='/finance/add'
+                color='primary'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
+              >
+                <Icon icon='heroicons:plus' width={20} height={20} />
+                Add Finance
               </Button>
             </RequirePermission>
           </div>
-      <Card
+
-        variant='bordered'
+          {/* Search and Filter */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
+            <DebouncedTextInput
+              name='search'
+              placeholder='Search'
+              value={tableFilterState.search ?? ''}
+              onChange={searchChangeHandler}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
+                />
+              }
               className={{
-          wrapper: 'w-full',
+                wrapper: 'w-full min-w-24 max-w-3xs',
+                inputWrapper: 'rounded-xl! shadow-button-soft',
+                input:
+                  'placeholder:font-semibold placeholder:text-base-content/50',
               }}
-        footer={
+            />
-          <div className='flex justify-end gap-2'>
+
             <Button
-              color='warning'
+              variant='outline'
-              className='min-w-24'
+              color='none'
-              onClick={resetFilterHandler}
+              onClick={handleFilterModalOpen}
+              className={cn(
+                'px-3 py-2.5 gap-1.5 text-sm text-base-content/50 border border-base-content/10 rounded-xl shadow-button-soft transition-all',
+                {
+                  'border-primary-gradient text-primary': hasFilters,
+                }
+              )}
             >
-              Reset
+              <Icon icon='heroicons:funnel' width={20} height={20} />
-            </Button>
+              Filter
-            <Button
+              {hasFilters && (
-              color='primary'
+                <span className='w-5 h-5 text-white bg-[#FF3535] rounded-lg border border-base-300 flex items-center justify-center text-xs'>
-              className='min-w-24'
+                  {activeFiltersCount}
-              onClick={() => filterFormik.handleSubmit()}
+                </span>
-            >
+              )}
-              Cari
             </Button>
           </div>
+        </div>
+
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(finances) || finances.data?.length === 0 ? (
+            <div className='p-3'>
+              <FinanceTableSkeleton
+                columns={columns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
                 }
+              />
+            </div>
+          ) : (
+            <Table<Finance>
+              data={isResponseSuccess(finances) ? finances.data : []}
+              columns={columns}
+              pageSize={tableFilterState.pageSize}
+              page={tableFilterState.page}
+              totalItems={
+                isResponseSuccess(finances) ? finances.meta?.total_results : 0
+              }
+              onPageChange={setPage}
+              onPageSizeChange={setPageSize}
+              isLoading={isLoading}
+              className={{
+                containerClassName: cn('p-3 mb-0'),
+                headerColumnClassName: 'text-nowrap',
+              }}
+            />
+          )}
+        </div>
+      </div>
+
+      {/* Filter Modal */}
+      <Modal
+        ref={filterModal.ref}
+        className={{
+          modal: 'p-0',
+          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
+        }}
       >
-        <div className='grid grid-cols-4 gap-6'>
+        {/* Modal Header */}
+        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
+          <div className='flex items-center gap-2 text-primary'>
+            <Icon icon='heroicons:funnel' width={20} height={20} />
+            <h3 className='font-medium text-sm'>Filter Data</h3>
+          </div>
+          <Button
+            variant='link'
+            onClick={filterModal.closeModal}
+            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
+          >
+            <Icon icon='heroicons:x-mark' width={20} height={20} />
+          </Button>
+        </div>
+        <form
+          onSubmit={filterFormik.handleSubmit}
+          onReset={filterFormik.handleReset}
+        >
+          <div className='p-4 flex flex-col gap-1.5'>
+            <div className='flex flex-col'>
+              <span className='py-2 text-xs font-semibold'>Tanggal</span>
+              <div className='flex flex-row items-center gap-1.5'>
+                <DateInput
+                  name='start_date'
+                  placeholder='Periode Tanggal Awal'
+                  value={filterFormik.values.start_date}
+                  errorMessage={filterFormik.errors.start_date}
+                  onChange={startDateChangeHandler}
+                  isError={
+                    filterFormik.touched.start_date &&
+                    Boolean(filterFormik.errors.start_date)
+                  }
+                />
+                <hr className='w-full max-w-3 h-px border-base-content/10' />
+                <DateInput
+                  name='end_date'
+                  placeholder='Periode Tanggal Akhir'
+                  value={filterFormik.values.end_date}
+                  errorMessage={filterFormik.errors.end_date}
+                  onChange={endDateChangeHandler}
+                  isError={
+                    (filterFormik.touched.end_date &&
+                      Boolean(filterFormik.errors.end_date)) ||
+                    hasDateError
+                  }
+                />
+              </div>
+            </div>
+
             <SelectInput
               options={FINANCE_TRANSACTION_TYPE_OPTIONS}
               label='Jenis Transaksi'
+              placeholder='Pilih Jenis Transaksi'
               value={selectedTransactionType}
               onChange={transactionTypeChangeHandler}
+              onInputChange={() => {}}
               closeMenuOnSelect={false}
               isClearable
               isMulti
+              className={{ wrapper: 'w-full' }}
             />
             <SelectInput
               options={customerOptions}
-            label={'Customer'}
+              label='Customer'
+              placeholder='Pilih Customer'
               value={selectedCustomerId}
               onChange={customerIdChangeHandler}
               onInputChange={customerInputValue}
@@ -626,10 +831,12 @@ const FinanceTable = () => {
               closeMenuOnSelect={false}
               isClearable
               isMulti
+              className={{ wrapper: 'w-full' }}
             />
             <SelectInput
               options={supplierOptions}
-            label={'Supplier'}
+              label='Supplier'
+              placeholder='Pilih Supplier'
               value={selectedSupplierId}
               onChange={supplierIdChangeHandler}
               onInputChange={supplierInputValue}
@@ -638,10 +845,12 @@ const FinanceTable = () => {
               closeMenuOnSelect={false}
               isClearable
               isMulti
+              className={{ wrapper: 'w-full' }}
             />
             <SelectInput
               options={bankSelectOptions}
               label='Bank'
+              placeholder='Pilih Bank'
               value={selectedBank}
               onChange={bankChangeHandler}
               onInputChange={bankInputValue}
@@ -649,57 +858,49 @@ const FinanceTable = () => {
               closeMenuOnSelect={false}
               isClearable
               isMulti
+              className={{ wrapper: 'w-full' }}
             />
             <SelectInput
               options={sortByOptions}
               label='Urutkan Berdasarkan'
+              placeholder='Pilih Urutan'
               value={selectedSortBy}
               onChange={sortByChangeHandler}
               isClearable
-          />
+              className={{ wrapper: 'w-full' }}
-          <DateInput
-            name='start_date'
-            label='Periode Tanggal (Mulai)'
-            value={filterFormik.values.start_date}
-            onChange={startDateChangeHandler}
-            errorMessage={
-              filterFormik.errors.end_date
-                ? filterFormik.errors.end_date
-                : undefined
-            }
-          />
-          <DateInput
-            name='end_date'
-            label='Periode Tanggal (Akhir)'
-            value={filterFormik.values.end_date}
-            onChange={endDateChangeHandler}
-            errorMessage={
-              filterFormik.errors.end_date
-                ? filterFormik.errors.end_date
-                : undefined
-            }
-          />
-          <DebouncedTextInput
-            name='search'
-            label='Cari'
-            placeholder='Cari'
-            value={filterFormik.values.search}
-            onChange={searchChangeHandler}
             />
           </div>
-      </Card>
+
-      <Table<Finance>
+          {/* Modal Footer */}
-        data={isResponseSuccess(finances) ? finances.data : []}
+          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
-        columns={columns}
+            <Button
-        pageSize={tableFilterState.pageSize}
+              type='button'
-        page={tableFilterState.page}
+              variant='soft'
-        onPageChange={setPage}
+              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
-        onPageSizeChange={setPageSize}
+              onClick={() => {
-        totalItems={
+                filterFormik.resetForm();
-          isResponseSuccess(finances) ? finances.meta?.total_results : 0
+                setSelectedTransactionType(null);
-        }
+                setSelectedBank(null);
-        isLoading={isLoading}
+                setSelectedCustomerId(null);
-      />
+                setSelectedSupplierId(null);
+                setSelectedSortBy(null);
+                resetFilterHandler();
+                filterModal.closeModal();
+              }}
+            >
+              Reset Filter
+            </Button>
+            <Button
+              type='submit'
+              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
+              disabled={!filterFormik.isValid || filterFormik.isSubmitting}
+            >
+              Apply Filter
+            </Button>
+          </div>
+        </form>
+      </Modal>
+
       <ConfirmationModal
         ref={deleteModal.ref}
         type='error'
@@ -714,7 +915,7 @@ const FinanceTable = () => {
           onClick: confirmationModalDeleteClickHandler,
         }}
       />
-    </section>
+    </>
   );
 };
 

src/components/pages/finance/skeleton/FinanceTableSkeleton.tsx

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

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

@@ -1,22 +1,48 @@
 'use client';
 
-import Badge from '@/components/Badge';
+import {
-import Button from '@/components/Button';
+  ChangeEventHandler,
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
+  useCallback,
-import Table from '@/components/Table';
+  useEffect,
-import RequirePermission from '@/components/helper/RequirePermission';
+  useMemo,
-import { ROWS_OPTIONS } from '@/config/constant';
+  useState,
-import { isResponseSuccess } from '@/lib/api-helper';
+} from 'react';
-import { cn } from '@/lib/helper';
+import { usePathname } from 'next/navigation';
-import { InventoryAdjustmentApi } from '@/services/api/inventory';
+import useSWR from 'swr';
-import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { InventoryAdjustment } from '@/types/api/inventory/adjustment';
 import { Icon } from '@iconify/react';
 import { ColumnDef, ColumnSort, SortingState } from '@tanstack/react-table';
-import { useCallback, useEffect, useState } from 'react';
+import { useFormik } from 'formik';
-import useSWR from 'swr';
+import Button from '@/components/Button';
+import Table from '@/components/Table';
+import RequirePermission from '@/components/helper/RequirePermission';
+import DebouncedTextInput from '@/components/input/DebouncedTextInput';
+import SelectInput, { useSelect } from '@/components/input/SelectInput';
+import { OptionType } from '@/components/input/SelectInput';
+import ButtonFilter from '@/components/helper/ButtonFilter';
+import Modal, { useModal } from '@/components/Modal';
+import { isResponseSuccess } from '@/lib/api-helper';
+import { cn, formatNumber, formatDate, formatCurrency } from '@/lib/helper';
+import { InventoryAdjustmentApi } from '@/services/api/inventory';
+import { WarehouseApi, ProductApi } from '@/services/api/master-data';
+import { useTableFilter } from '@/services/hooks/useTableFilter';
+import { useUiStore } from '@/stores/ui/ui.store';
+import { InventoryAdjustment } from '@/types/api/inventory/adjustment';
+import { Warehouse } from '@/types/api/master-data/warehouse';
+import { TRANSACTION_SUBTYPE_OPTIONS } from '@/config/constant';
+import { Product } from '@/types/api/master-data/product';
+import StatusBadge from '@/components/helper/StatusBadge';
+import InventoryAdjustmentTableSkeleton from '@/components/pages/inventory/adjustment/skeleton/InventoryAdjustmentTableSkeleton';
+
+import {
+  AdjustmentFilterSchema,
+  AdjustmentFilterType,
+} from '@/components/pages/inventory/adjustment/filter/AdjustmentFilter';
+import SelectInputRadio from '@/components/input/SelectInputRadio';
 
 const InventoryAdjustmentTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -30,6 +56,9 @@ const InventoryAdjustmentTable = () => {
       productSort: '',
       warehouseSort: '',
       stockSort: '',
+      productFilter: '',
+      warehouseFilter: '',
+      transactionTypeFilter: '',
     },
     paramMap: {
       page: 'page',
@@ -38,31 +67,169 @@ const InventoryAdjustmentTable = () => {
       productSort: 'sort_product',
       warehouseSort: 'sort_warehouse',
       stockSort: 'sort_stock',
+      productFilter: 'product_id',
+      warehouseFilter: 'warehouse_id',
+      transactionTypeFilter: 'transaction_type',
     },
   });
 
-  // Fetch Data
+  // ===== FILTER MODAL STATE =====
+  const filterModal = useModal();
+
+  // ===== FORMIK SETUP =====
+  const formik = useFormik<AdjustmentFilterType>({
+    initialValues: {
+      product_id: null,
+      warehouse_id: null,
+      transaction_type: null,
+    },
+    validationSchema: AdjustmentFilterSchema,
+    onSubmit: (values, { setSubmitting }) => {
+      updateFilter('productFilter', values.product_id || '');
+      updateFilter('warehouseFilter', values.warehouse_id || '');
+      updateFilter('transactionTypeFilter', values.transaction_type || '');
+      filterModal.closeModal();
+      setSubmitting(false);
+    },
+    onReset: () => {
+      updateFilter('productFilter', '');
+      updateFilter('warehouseFilter', '');
+      updateFilter('transactionTypeFilter', '');
+    },
+  });
+
+  // ===== PRODUCT OPTIONS =====
+  const {
+    setInputValue: setProductInputValue,
+    options: productOptions,
+    isLoadingOptions: isLoadingProductOptions,
+    loadMore: loadMoreProducts,
+  } = useSelect<Product>(
+    filterModal.open ? ProductApi.basePath : null,
+    'id',
+    'name',
+    'search'
+  );
+
+  // ===== WAREHOUSE OPTIONS =====
+  const {
+    setInputValue: setWarehouseInputValue,
+    options: warehouseOptions,
+    isLoadingOptions: isLoadingWarehouseOptions,
+    loadMore: loadMoreWarehouses,
+  } = useSelect<Warehouse>(
+    filterModal.open ? WarehouseApi.basePath : null,
+    'id',
+    'name',
+    'search'
+  );
+
+  // ===== TRANSACTION TYPE OPTIONS =====
+  const transactionTypeOptions = useMemo(() => {
+    return [
+      { value: 'increase', label: 'Increase' },
+      { value: 'decrease', label: 'Decrease' },
+    ];
+  }, []);
+
+  // ===== FILTER HANDLERS =====
+  const handleFilterProductChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const product = val as OptionType | null;
+      const productId = product?.value ? String(product.value) : null;
+      formik.setFieldValue('product_id', productId);
+    },
+    [formik]
+  );
+
+  const handleFilterWarehouseChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const warehouse = val as OptionType | null;
+      const warehouseId = warehouse?.value ? String(warehouse.value) : null;
+      formik.setFieldValue('warehouse_id', warehouseId);
+    },
+    [formik]
+  );
+
+  const handleFilterTransactionTypeChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const type = val as OptionType | null;
+      const typeValue = type?.value ? String(type.value) : null;
+      formik.setFieldValue('transaction_type', typeValue);
+    },
+    [formik]
+  );
+
+  // ===== FILTER HELPERS =====
+  const productIdValue = useMemo(() => {
+    if (!formik.values.product_id) return null;
+    return (
+      productOptions.find(
+        (opt) => String(opt.value) === formik.values.product_id
+      ) || null
+    );
+  }, [formik.values.product_id, productOptions]);
+
+  const warehouseIdValue = useMemo(() => {
+    if (!formik.values.warehouse_id) return null;
+    return (
+      warehouseOptions.find(
+        (opt) => String(opt.value) === formik.values.warehouse_id
+      ) || null
+    );
+  }, [formik.values.warehouse_id, warehouseOptions]);
+
+  const transactionTypeValue = useMemo(() => {
+    if (!formik.values.transaction_type) return null;
+    return (
+      transactionTypeOptions.find(
+        (opt) => String(opt.value) === formik.values.transaction_type
+      ) || null
+    );
+  }, [formik.values.transaction_type, transactionTypeOptions]);
+
+  // ===== HANDLE FILTER MODAL OPEN =====
+  const handleFilterModalOpen = () => {
+    filterModal.openModal();
+    formik.validateForm();
+  };
+
   const { data: inventoryAdjustments, isLoading } = useSWR(
     `${InventoryAdjustmentApi.basePath}${getTableFilterQueryString()}`,
     InventoryAdjustmentApi.getAllFetcher
   );
 
-  // State
   const [sorting, setSorting] = useState<SortingState>([]);
 
-  // Columns
+  useEffect(() => {
-  const inventoryAdjustmentsColumns: ColumnDef<InventoryAdjustment>[] = [
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('inventory-adjustment-table', pathname);
+  }, [pathname, setTableState]);
+
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
+  };
+
+  const inventoryAdjustmentsColumns: ColumnDef<InventoryAdjustment>[] = useMemo(
+    () => [
       {
-      header: '#',
+        id: 'adj_number',
-      cell: (props) =>
+        header: 'No. Referensi',
-        tableFilterState.pageSize * (tableFilterState.page - 1) +
+        accessorFn: (row) => row.adj_number ?? '-',
-        props.row.index +
-        1,
       },
       {
-      id: 'product_name',
+        id: 'location',
-      header: 'Nama Produk',
+        header: 'Lokasi',
-      accessorFn: (row) => row.product_warehouse?.product?.name ?? '-',
+        accessorFn: (row) => row.location?.name ?? '-',
+      },
+      {
+        id: 'project_flock',
+        header: 'Flock',
+        accessorFn: (row) => row.project_flock?.flock_name ?? '-',
       },
       {
         id: 'warehouse_name',
@@ -70,51 +237,86 @@ const InventoryAdjustmentTable = () => {
         accessorFn: (row) => row.product_warehouse?.warehouse?.name ?? '-',
       },
       {
-      id: 'created_at',
+        id: 'product_name',
-      header: 'Tanggal',
+        header: 'Nama Produk',
-      accessorFn: (row) =>
+        accessorFn: (row) => row.product_warehouse?.product?.name ?? '-',
-        new Date(row.created_at).toLocaleDateString('id-ID', {
-          day: '2-digit',
-          month: 'short',
-          year: 'numeric',
-        }),
       },
       {
         id: 'quantity',
         header: 'Kuantitas',
-      accessorFn: (row) => formatNumber(String(row.increase + row.decrease)),
+        accessorFn: (row) => row.qty ?? '-',
+        cell: (row) => {
+          const value = row.row.original.increase + row.row.original.decrease;
+          return <div className='text-center'>{formatNumber(value)}</div>;
+        },
+      },
+      {
+        id: 'price',
+        header: 'Harga',
+        accessorFn: (row) => (row.price ? formatCurrency(row.price) : '-'),
+      },
+      {
+        id: 'grand_total',
+        header: 'Grand Total',
+        accessorFn: (row) =>
+          row.grand_total ? formatCurrency(row.grand_total) : '-',
       },
       {
         id: 'transaction_type',
         header: 'Tipe Transaksi',
-      accessorFn: (row) => {
+        accessorFn: (row) => row.transaction_subtype ?? '-',
-        if (row.increase > 0) return 'Peningkatan';
+        cell: (row) => {
-        if (row.decrease > 0) return 'Penurunan';
+          const subtype = row.row.original.transaction_subtype;
-        return '-';
+          const increase = row.row.original.increase;
-      },
+
-      cell: (props) => {
+          const getSubtypeLabel = (subtypeValue: string): string => {
-        const type = props.row.original.increase;
+            if (subtypeValue === TRANSACTION_SUBTYPE_OPTIONS.PEMBELIAN.value) {
-        const label = type > 0 ? 'Peningkatan' : type <= 0 ? 'Penurunan' : '-';
+              return TRANSACTION_SUBTYPE_OPTIONS.PEMBELIAN.label;
+            }
+            if (subtypeValue === TRANSACTION_SUBTYPE_OPTIONS.PENJUALAN.value) {
+              return TRANSACTION_SUBTYPE_OPTIONS.PENJUALAN.label;
+            }
+            const recordingOption = TRANSACTION_SUBTYPE_OPTIONS.RECORDING.find(
+              (opt) => opt.value === subtypeValue
+            );
+            if (recordingOption) {
+              return recordingOption.label;
+            }
+            if (subtypeValue === 'RECORDING_DEPLETION_OUT') {
+              return 'Recording Depletion';
+            }
+            return subtypeValue || '-';
+          };
+
+          const label = getSubtypeLabel(subtype);
 
           return (
-          <Badge variant='soft' color={type > 0 ? 'success' : 'error'}>
+            <StatusBadge
-            {label}
+              color={
-          </Badge>
+                increase > 0 ? 'success' : increase <= 0 ? 'error' : 'neutral'
+              }
+              text={label}
+              className={{
+                badge: 'whitespace-nowrap',
+              }}
+            />
           );
         },
       },
+      {
+        id: 'created_at',
+        header: 'Tanggal',
+        accessorFn: (row) =>
+          row.created_at ? formatDate(row.created_at, 'DD MMM YYYY') : '-',
+      },
       {
         id: 'created_by',
         header: 'Oleh',
         accessorFn: (row) => row.created_user?.name ?? '-',
       },
-  ];
+    ],
-
+    [tableFilterState.pageSize, tableFilterState.page]
-  // Handler
+  );
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
-    const newVal = val as OptionType;
-    setPageSize(newVal.value as number);
-  };
 
   const updateSortingFilter = useCallback(
     (
@@ -130,7 +332,6 @@ const InventoryAdjustmentTable = () => {
     [updateFilter]
   );
 
-  // Effect
   useEffect(() => {
     const productCategorySortFilter = sorting.find(
       (sortItem) => sortItem.id === 'productCategory'
@@ -149,48 +350,86 @@ const InventoryAdjustmentTable = () => {
     updateSortingFilter('stockSort', stockSortFilter);
   }, [sorting, updateSortingFilter]);
 
-  // Utils Function
-  const formatNumber = (value: string) => {
-    const numericValue = value.replace(/[^0-9.]/g, '');
-    const [integer, decimal] = numericValue.split('.');
-    const formattedInteger = integer.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-    return decimal ? `${formattedInteger}.${decimal}` : formattedInteger;
-  };
-
-  // Render
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row'>
+          {/* Action Buttons */}
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.inventory.create'>
               <Button
                 href='/inventory/adjustment/add'
-                  variant='outline'
                 color='primary'
-                  className='w-full sm:w-fit'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-                  <Icon icon='ic:round-plus' width={24} height={24} />
+                <Icon icon='heroicons:plus' width={20} height={20} />
-                  Tambah
+                Add Adjustment
               </Button>
             </RequirePermission>
           </div>
 
-            <div className='flex flex-row justify-end'>
+          {/* Search and Filter */}
-              <SelectInput
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
-                label='Baris'
+            <DebouncedTextInput
-                options={ROWS_OPTIONS}
+              name='search'
-                value={{
+              placeholder='Search'
-                  label: String(tableFilterState.pageSize),
+              value={tableFilterState.search ?? ''}
-                  value: tableFilterState.pageSize,
+              onChange={searchChangeHandler}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
+                />
+              }
+              className={{
+                wrapper: 'w-full min-w-24 max-w-3xs',
+                inputWrapper: 'rounded-xl! shadow-button-soft',
+                input:
+                  'placeholder:font-semibold placeholder:text-base-content/50',
               }}
-                onChange={pageSizeChangeHandler}
+            />
-                className={{ wrapper: 'min-w-28' }}
+
+            <ButtonFilter
+              values={tableFilterState}
+              excludeFields={[
+                'page',
+                'pageSize',
+                'search',
+                'productCategorySort',
+                'productSort',
+                'warehouseSort',
+                'stockSort',
+              ]}
+              onClick={handleFilterModalOpen}
+              className='px-3 py-2.5'
             />
           </div>
         </div>
 
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(inventoryAdjustments) ||
+            inventoryAdjustments.data?.length === 0 ? (
+            <div className='p-3'>
+              <InventoryAdjustmentTableSkeleton
+                columns={inventoryAdjustmentsColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<InventoryAdjustment>
               data={
                 isResponseSuccess(inventoryAdjustments)
@@ -210,27 +449,101 @@ const InventoryAdjustmentTable = () => {
                   : 0
               }
               onPageChange={setPage}
+              onPageSizeChange={setPageSize}
               isLoading={isLoading}
               sorting={sorting}
               setSorting={setSorting}
               className={{
-              containerClassName: cn({
+                containerClassName: cn('p-3 mb-0'),
-                'mb-20':
+                headerColumnClassName: 'text-nowrap',
-                  isResponseSuccess(inventoryAdjustments) &&
-                  inventoryAdjustments?.data?.length === 0,
-              }),
-              tableWrapperClassName: 'overflow-x-auto min-h-full!',
-              tableClassName: 'font-inter w-full table-auto min-h-full!',
-              headerRowClassName: 'border-b border-b-gray-200',
-              headerColumnClassName:
-                'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-              bodyRowClassName: 'border-b border-b-gray-200',
-              bodyColumnClassName:
-                'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
         </div>
       </div>
+
+      {/* Filter Modal */}
+      <Modal
+        ref={filterModal.ref}
+        className={{
+          modal: 'p-0',
+          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
+        }}
+      >
+        {/* Modal Header */}
+        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
+          <div className='flex items-center gap-2 text-primary'>
+            <Icon icon='heroicons:funnel' width={20} height={20} />
+            <h3 className='font-medium text-sm'>Filter Data</h3>
+          </div>
+          <Button
+            variant='link'
+            onClick={filterModal.closeModal}
+            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
+          >
+            <Icon icon='heroicons:x-mark' width={20} height={20} />
+          </Button>
+        </div>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
+          <div className='p-4 flex flex-col gap-1.5'>
+            <SelectInput
+              label='Produk'
+              placeholder='Pilih Produk'
+              options={productOptions}
+              value={productIdValue}
+              onChange={handleFilterProductChange}
+              onInputChange={setProductInputValue}
+              isLoading={isLoadingProductOptions}
+              isClearable
+              onMenuScrollToBottom={loadMoreProducts}
+              className={{ wrapper: 'w-full' }}
+            />
+            <SelectInput
+              label='Gudang'
+              placeholder='Pilih Gudang'
+              options={warehouseOptions}
+              value={warehouseIdValue}
+              onChange={handleFilterWarehouseChange}
+              onInputChange={setWarehouseInputValue}
+              isLoading={isLoadingWarehouseOptions}
+              isClearable
+              onMenuScrollToBottom={loadMoreWarehouses}
+              className={{ wrapper: 'w-full' }}
+            />
+            <SelectInputRadio
+              label='Tipe Transaksi'
+              placeholder='Pilih Tipe Transaksi'
+              options={transactionTypeOptions}
+              value={transactionTypeValue}
+              onChange={handleFilterTransactionTypeChange}
+              isClearable
+              className={{ wrapper: 'w-full' }}
+            />
+          </div>
+
+          {/* Modal Footer */}
+          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
+            <Button
+              type='button'
+              variant='soft'
+              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
+              onClick={() => {
+                formik.resetForm();
+                filterModal.closeModal();
+              }}
+            >
+              Reset Filter
+            </Button>
+            <Button
+              type='submit'
+              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
+              disabled={!formik.isValid || formik.isSubmitting}
+            >
+              Apply Filter
+            </Button>
+          </div>
+        </form>
+      </Modal>
     </>
   );
 };

src/components/pages/inventory/adjustment/filter/AdjustmentFilter.ts

@@ -0,0 +1,13 @@
+import { string, object } from 'yup';
+
+export const AdjustmentFilterSchema = object().shape({
+  product_id: string().nullable(),
+  warehouse_id: string().nullable(),
+  transaction_type: string().nullable(),
+});
+
+export type AdjustmentFilterType = {
+  product_id: string | null;
+  warehouse_id: string | null;
+  transaction_type: string | null;
+};

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

@@ -1,54 +1,117 @@
 import * as Yup from 'yup';
-import { OptionType } from '@/components/input/SelectInput';
 
-export const InventoryAdjustmentFormSchema = Yup.object({
+export type InventoryAdjustmentFormSchemaType = {
-  product_category: Yup.mixed<OptionType>()
+  location: {
-    .nullable()
+    value: number;
+    label: string;
+  } | null;
+  location_id: number;
+  project_flock: {
+    value: number;
+    label: string;
+  } | null;
+  project_flock_id: number;
+  kandang: {
+    value: number;
+    label: string;
+  } | null;
+  kandang_id: number;
+  project_flock_kandang: {
+    value: number;
+    label: string;
+  } | null;
+  project_flock_kandang_id: number;
+  product: {
+    value: number;
+    label: string;
+  } | null;
+  product_id: number;
+  depletion_product: {
+    value: number;
+    label: string;
+  } | null;
+  depletion_product_id: number;
+  transaction_type: string;
+  transaction_subtype: string;
+  qty: number | string;
+  price: number | string;
+  notes: string;
+};
+
+export const InventoryAdjustmentFormSchema: Yup.ObjectSchema<InventoryAdjustmentFormSchemaType> =
+  Yup.object({
+    location: Yup.object({
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+    }).nullable(),
+    location_id: Yup.number()
+      .min(1, 'Lokasi wajib diisi!')
+      .required('Lokasi wajib diisi!')
+      .typeError('Lokasi wajib diisi!'),
+    project_flock: Yup.object({
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+    }).nullable(),
+    project_flock_id: Yup.number()
+      .min(1, 'Project flock wajib diisi!')
+      .required('Project flock wajib diisi!')
+      .typeError('Project flock wajib diisi!'),
+    kandang: Yup.object({
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+    }).nullable(),
+    kandang_id: Yup.number()
+      .min(1, 'Kandang wajib diisi!')
+      .required('Kandang wajib diisi!')
+      .typeError('Kandang wajib diisi!'),
+    project_flock_kandang: Yup.object({
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+    }).nullable(),
+    project_flock_kandang_id: Yup.number()
+      .default(0)
+      .typeError('Project Flock Kandang wajib diisi!')
       .test(
-      'is-valid-option',
+        'is-valid-project-flock-kandang',
-      'Kategori Produk wajib diisi!',
+        'Project Flock Kandang wajib diisi!',
-      (value) => value !== null && value !== undefined
+        (value) => value !== undefined && value !== null && value > 0
-    ),
+      )
-
+      .required('Project Flock Kandang wajib diisi!'),
-  product_category_id: Yup.number().nullable(),
+    product: Yup.object({
-
+      value: Yup.number().min(1).required(),
-  product: Yup.mixed<OptionType>()
+      label: Yup.string().required(),
-    .nullable()
+    }).nullable(),
-    .test(
-      'is-valid-option',
-      'Produk wajib diisi!',
-      (value) => value !== null && value !== undefined
-    ),
-
     product_id: Yup.number()
-    .nullable()
+      .min(1, 'Produk wajib diisi!')
       .required('Produk wajib diisi!')
-    .min(1, 'Produk wajib diisi!'),
+      .typeError('Produk wajib diisi!'),
-
+    depletion_product: Yup.object({
-  warehouse: Yup.mixed<OptionType>()
+      value: Yup.number().min(1).required(),
-    .nullable()
+      label: Yup.string().required(),
-    .test(
+    }).nullable(),
-      'is-valid-option',
+    depletion_product_id: Yup.number()
-      'Warehouse wajib diisi!',
+      .default(0)
-      (value) => value !== null && value !== undefined
+      .typeError('Jenis deplesi harus berupa angka'),
-    ),
-
-  warehouse_id: Yup.number()
-    .nullable()
-    .required('Warehouse wajib diisi!')
-    .min(1, 'Warehouse wajib diisi!'),
-
     transaction_type: Yup.string()
-    .oneOf(['increase', 'decrease'], 'Tipe transaksi tidak valid')
+      .min(1, 'Tipe transaksi wajib diisi!')
-    .nullable()
+      .oneOf(
-    .required('Tipe transaksi wajib diisi'),
+        ['PEMBELIAN', 'PENJUALAN', 'RECORDING'],
-
+        'Tipe transaksi tidak valid'
-  quantity: Yup.number()
+      )
+      .required('Tipe transaksi wajib diisi')
+      .typeError('Tipe transaksi wajib diisi!'),
+    transaction_subtype: Yup.string().required(
+      'Sub tipe transaksi wajib diisi'
+    ),
+    qty: Yup.number()
       .typeError('Kuantitas harus berupa angka')
       .min(1, 'Minimal kuantitas adalah 1')
       .required('Kuantitas wajib diisi'),
-
+    price: Yup.number()
-  note: Yup.string().required('Catatan wajib diisi!'),
+      .typeError('Harga harus berupa angka')
+      .min(0, 'Minimal harga adalah 0')
+      .required('Harga wajib diisi'),
+    notes: Yup.string().required('Catatan wajib diisi!'),
   });
 
 export type InventoryAdjustmentFormValues = Yup.InferType<

src/components/pages/inventory/adjustment/skeleton/InventoryAdjustmentTableSkeleton.tsx

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

src/components/pages/inventory/movement/MovementTable.tsx

@@ -1,49 +1,98 @@
 'use client';
 
-import { ChangeEventHandler, useState } from 'react';
+import {
+  ChangeEventHandler,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
+import { usePathname } from 'next/navigation';
 import useSWR from 'swr';
 import { SortingState, CellContext, ColumnDef } from '@tanstack/react-table';
+import { useFormik } from 'formik';
 
 import Table from '@/components/Table';
 import { Icon } from '@iconify/react';
 import { Movement } from '@/types/api/inventory/movement';
 import { MovementApi } from '@/services/api/inventory';
+import { WarehouseApi, ProductApi } from '@/services/api/master-data';
 import { cn } from '@/lib/helper';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { ROWS_OPTIONS } from '@/config/constant';
+import { useUiStore } from '@/stores/ui/ui.store';
-import { OptionType } from '@/components/input/SelectInput';
 import Button from '@/components/Button';
 import DebouncedTextInput from '@/components/input/DebouncedTextInput';
-import SelectInput from '@/components/input/SelectInput';
+import SelectInput, { useSelect } from '@/components/input/SelectInput';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
+import { OptionType } from '@/components/input/SelectInput';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
+import ButtonFilter from '@/components/helper/ButtonFilter';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
+import Modal, { useModal } from '@/components/Modal';
 import RequirePermission from '@/components/helper/RequirePermission';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
+import MovementTableSkeleton from '@/components/pages/inventory/movement/skeleton/MovementTableSkeleton';
+import { Warehouse } from '@/types/api/master-data/warehouse';
+import { Product } from '@/types/api/master-data/product';
+import {
+  MovementFilterSchema,
+  MovementFilterType,
+} from '@/components/pages/inventory/movement/filter/MovementFilter';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Movement, unknown>;
-}) => (
+}) => {
-  <RowOptionsMenuWrapper type={type}>
+  const popoverId = `movement#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-movement#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
+  return (
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.inventory.transfer.detail'>
             <Button
               href={`/inventory/movement/detail/?movementId=${props.row.original.id}`}
               variant='ghost'
-        color='primary'
+              color='none'
-        className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-        <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
-  </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
+};
 
 const MovementTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -53,13 +102,109 @@ const MovementTable = () => {
   } = useTableFilter({
     initial: {
       search: '',
+      productFilter: '',
+      warehouseFilter: '',
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
+      productFilter: 'product_id',
+      warehouseFilter: 'warehouse_id',
     },
   });
 
+  // ===== FILTER MODAL STATE =====
+  const filterModal = useModal();
+
+  // ===== FORMIK SETUP =====
+  const formik = useFormik<MovementFilterType>({
+    initialValues: {
+      product_id: null,
+      warehouse_id: null,
+    },
+    validationSchema: MovementFilterSchema,
+    onSubmit: (values, { setSubmitting }) => {
+      updateFilter('productFilter', values.product_id || '');
+      updateFilter('warehouseFilter', values.warehouse_id || '');
+      filterModal.closeModal();
+      setSubmitting(false);
+    },
+    onReset: () => {
+      updateFilter('productFilter', '');
+      updateFilter('warehouseFilter', '');
+    },
+  });
+
+  // ===== PRODUCT OPTIONS =====
+  const {
+    setInputValue: setProductInputValue,
+    options: productOptions,
+    isLoadingOptions: isLoadingProductOptions,
+    loadMore: loadMoreProducts,
+  } = useSelect<Product>(
+    filterModal.open ? ProductApi.basePath : null,
+    'id',
+    'name',
+    'search'
+  );
+
+  // ===== WAREHOUSE OPTIONS =====
+  const {
+    setInputValue: setWarehouseInputValue,
+    options: warehouseOptions,
+    isLoadingOptions: isLoadingWarehouseOptions,
+    loadMore: loadMoreWarehouses,
+  } = useSelect<Warehouse>(
+    filterModal.open ? WarehouseApi.basePath : null,
+    'id',
+    'name',
+    'search'
+  );
+
+  // ===== FILTER HANDLERS =====
+  const handleFilterProductChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const product = val as OptionType | null;
+      const productId = product?.value ? String(product.value) : null;
+      formik.setFieldValue('product_id', productId);
+    },
+    [formik]
+  );
+
+  const handleFilterWarehouseChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const warehouse = val as OptionType | null;
+      const warehouseId = warehouse?.value ? String(warehouse.value) : null;
+      formik.setFieldValue('warehouse_id', warehouseId);
+    },
+    [formik]
+  );
+
+  // ===== FILTER HELPERS =====
+  const productIdValue = useMemo(() => {
+    if (!formik.values.product_id) return null;
+    return (
+      productOptions.find(
+        (opt) => String(opt.value) === formik.values.product_id
+      ) || null
+    );
+  }, [formik.values.product_id, productOptions]);
+
+  const warehouseIdValue = useMemo(() => {
+    if (!formik.values.warehouse_id) return null;
+    return (
+      warehouseOptions.find(
+        (opt) => String(opt.value) === formik.values.warehouse_id
+      ) || null
+    );
+  }, [formik.values.warehouse_id, warehouseOptions]);
+
+  // ===== HANDLE FILTER MODAL OPEN =====
+  const handleFilterModalOpen = () => {
+    filterModal.openModal();
+    formik.validateForm();
+  };
+
   const [sorting, setSorting] = useState<SortingState>([]);
 
   const { data: movements, isLoading } = useSWR(
@@ -67,19 +212,23 @@ const MovementTable = () => {
     MovementApi.getAllFetcher
   );
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('movement-table', pathname);
+  }, [pathname, setTableState]);
+
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    setSearchValue(e.target.value);
     updateFilter('search', e.target.value);
   };
 
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+  const movementColumns: ColumnDef<Movement>[] = useMemo(
-    const newVal = val as OptionType;
+    () => [
-    setPageSize(newVal.value as number);
-    setPage(1);
-  };
-
-  const movementColumns: ColumnDef<Movement>[] = [
       {
-      header: '#',
+        header: 'No',
         cell: (props) =>
           tableFilterState.pageSize * (tableFilterState.page - 1) +
           props.row.index +
@@ -101,7 +250,9 @@ const MovementTable = () => {
         accessorKey: 'transfer_date',
         header: 'Tanggal',
         cell: (props) =>
-        new Date(props.row.original.transfer_date).toLocaleDateString('id-ID'),
+          new Date(props.row.original.transfer_date).toLocaleDateString(
+            'id-ID'
+          ),
       },
       {
         accessorFn: (row) => {
@@ -115,8 +266,9 @@ const MovementTable = () => {
       },
       {
         header: 'Aksi',
-      cell: (props) => {
+        cell: (props: CellContext<Movement, unknown>) => {
-        const currentPageSize = props.table.getPaginationRowModel().rows.length;
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
           const currentPageRows = props.table.getPaginationRowModel().flatRows;
           const currentRowRelativeIndex =
             currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
@@ -124,30 +276,24 @@ const MovementTable = () => {
           const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
 
           return (
-          <>
+            <RowOptionsMenu
-            {currentPageSize > 2 && (
+              props={props}
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
-                <RowOptionsMenu type='dropdown' props={props} />
+            />
-              </RowDropdownOptions>
-            )}
-
-            {currentPageSize <= 2 && (
-              <RowCollapseOptions>
-                <RowOptionsMenu type='collapse' props={props} />
-              </RowCollapseOptions>
-            )}
-          </>
           );
         },
       },
-  ];
+    ],
+    [tableFilterState.pageSize, tableFilterState.page]
+  );
 
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row gap-2'>
+          {/* Action Buttons */}
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.inventory.transfer.create'>
               <Button
                 href='/inventory/movement/add'
@@ -160,60 +306,155 @@ const MovementTable = () => {
             </RequirePermission>
           </div>
 
+          {/* Search and Filter */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-              placeholder='Cari Movement'
+              placeholder='Search'
-              value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
                 />
-          </div>
+              }
-
-          <div className='flex justify-end gap-4'>
-            <SelectInput
-              label='Baris'
-              options={ROWS_OPTIONS}
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
-              }}
-              onChange={pageSizeChangeHandler}
               className={{
-                wrapper:
+                wrapper: 'w-full min-w-24 max-w-3xs',
-                  'col-span-6 sm:col-span-4 max-w-28 sm:justify-self-end',
+                inputWrapper: 'rounded-xl! shadow-button-soft',
+                input:
+                  'placeholder:font-semibold placeholder:text-base-content/50',
               }}
             />
+
+            <ButtonFilter
+              values={tableFilterState}
+              excludeFields={['page', 'pageSize', 'search']}
+              onClick={handleFilterModalOpen}
+              className='px-3 py-2.5'
+            />
           </div>
         </div>
 
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(movements) || movements.data?.length === 0 ? (
+            <div className='p-3'>
+              <MovementTableSkeleton
+                columns={movementColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<Movement>
               data={isResponseSuccess(movements) ? movements?.data : []}
               columns={movementColumns}
               pageSize={tableFilterState.pageSize}
               page={isResponseSuccess(movements) ? movements?.meta?.page : 0}
               totalItems={
-            isResponseSuccess(movements) ? movements?.meta?.total_results : 0
+                isResponseSuccess(movements)
+                  ? movements?.meta?.total_results
+                  : 0
               }
               onPageChange={setPage}
+              onPageSizeChange={setPageSize}
               isLoading={isLoading}
               sorting={sorting}
               setSorting={setSorting}
               className={{
-            containerClassName: cn({
+                containerClassName: cn('p-3 mb-0'),
-              'mb-20':
+                headerColumnClassName: 'text-nowrap',
-                isResponseSuccess(movements) && movements?.data?.length === 0,
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
         </div>
+      </div>
+
+      {/* Filter Modal */}
+      <Modal
+        ref={filterModal.ref}
+        className={{
+          modal: 'p-0',
+          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
+        }}
+      >
+        {/* Modal Header */}
+        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
+          <div className='flex items-center gap-2 text-primary'>
+            <Icon icon='heroicons:funnel' width={20} height={20} />
+            <h3 className='font-medium text-sm'>Filter Data</h3>
+          </div>
+          <Button
+            variant='link'
+            onClick={filterModal.closeModal}
+            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
+          >
+            <Icon icon='heroicons:x-mark' width={20} height={20} />
+          </Button>
+        </div>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
+          <div className='p-4 flex flex-col gap-1.5'>
+            <SelectInput
+              label='Produk'
+              placeholder='Pilih Produk'
+              options={productOptions}
+              value={productIdValue}
+              onChange={handleFilterProductChange}
+              onInputChange={setProductInputValue}
+              isLoading={isLoadingProductOptions}
+              isClearable
+              onMenuScrollToBottom={loadMoreProducts}
+              className={{ wrapper: 'w-full' }}
+            />
+            <SelectInput
+              label='Gudang'
+              placeholder='Pilih Gudang'
+              options={warehouseOptions}
+              value={warehouseIdValue}
+              onChange={handleFilterWarehouseChange}
+              onInputChange={setWarehouseInputValue}
+              isLoading={isLoadingWarehouseOptions}
+              isClearable
+              onMenuScrollToBottom={loadMoreWarehouses}
+              className={{ wrapper: 'w-full' }}
+            />
+          </div>
+
+          {/* Modal Footer */}
+          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
+            <Button
+              type='button'
+              variant='soft'
+              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
+              onClick={() => {
+                formik.resetForm();
+                filterModal.closeModal();
+              }}
+            >
+              Reset Filter
+            </Button>
+            <Button
+              type='submit'
+              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
+              disabled={!formik.isValid || formik.isSubmitting}
+            >
+              Apply Filter
+            </Button>
+          </div>
+        </form>
+      </Modal>
     </>
   );
 };

src/components/pages/inventory/movement/filter/MovementFilter.ts

@@ -0,0 +1,11 @@
+import { string, object } from 'yup';
+
+export const MovementFilterSchema = object().shape({
+  product_id: string().nullable(),
+  warehouse_id: string().nullable(),
+});
+
+export type MovementFilterType = {
+  product_id: string | null;
+  warehouse_id: string | null;
+};

src/components/pages/inventory/movement/skeleton/MovementTableSkeleton.tsx

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

src/components/pages/inventory/product/InventoryProductTable.tsx

@@ -2,46 +2,78 @@
 
 import Button from '@/components/Button';
 import DebouncedTextInput from '@/components/input/DebouncedTextInput';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
 import Table from '@/components/Table';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RequirePermission from '@/components/helper/RequirePermission';
-import { ROWS_OPTIONS } from '@/config/constant';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { cn, formatCurrency, formatNumber } from '@/lib/helper';
 import { InventoryProductApi } from '@/services/api/inventory';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
+import { useUiStore } from '@/stores/ui/ui.store';
 import { InventoryProduct } from '@/types/api/inventory/product';
 import { Icon } from '@iconify/react';
 import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
-import { ChangeEventHandler, useMemo, useState } from 'react';
+import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
+import { usePathname } from 'next/navigation';
 import useSWR from 'swr';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
+import InventoryProductTableSkeleton from '@/components/pages/inventory/product/skeleton/InventoryProductTableSkeleton';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<InventoryProduct, unknown>;
-}) => (
+}) => {
-  <RowOptionsMenuWrapper type={type}>
+  const popoverId = `product#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-product#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
+  return (
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.inventory.product_stock.detail'>
             <Button
               href={`/inventory/product/detail?inventoryProductId=${props.row.original.id}`}
               variant='ghost'
-        color='primary'
+              color='none'
-        className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-        <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
-  </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
+};
 
 const InventoryProductTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -65,20 +97,23 @@ const InventoryProductTable = () => {
     InventoryProductApi.getAllFetcher
   );
 
-  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+  useEffect(() => {
-    updateFilter('search', e.target.value);
+    updateFilter('search', searchValue);
-  };
+  }, [searchValue, updateFilter]);
 
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+  useEffect(() => {
-    const newVal = val as OptionType;
+    setTableState('inventory-product-table', pathname);
-    setPageSize(newVal.value as number);
+  }, [pathname, setTableState]);
-    setPage(1);
+
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const columns: ColumnDef<InventoryProduct>[] = useMemo(
     () => [
       {
-        header: '#',
+        header: 'No',
         cell: (props) =>
           tableFilterState.pageSize * (tableFilterState.page - 1) +
           props.row.index +
@@ -125,7 +160,7 @@ const InventoryProductTable = () => {
       },
       {
         header: 'Aksi',
-        cell: (props) => {
+        cell: (props: CellContext<InventoryProduct, unknown>) => {
           const currentPageSize =
             props.table.getPaginationRowModel().rows.length;
           const currentPageRows = props.table.getPaginationRowModel().flatRows;
@@ -135,61 +170,82 @@ const InventoryProductTable = () => {
           const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
 
           return (
-            <>
+            <RowOptionsMenu
-              {currentPageSize > 2 && (
+              props={props}
-                <RowDropdownOptions isLast2Rows={isLast2Rows}>
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
-                  <RowOptionsMenu type='dropdown' props={props} />
+            />
-                </RowDropdownOptions>
-              )}
-
-              {currentPageSize <= 2 && (
-                <RowCollapseOptions>
-                  <RowOptionsMenu type='collapse' props={props} />
-                </RowCollapseOptions>
-              )}
-            </>
           );
         },
       },
     ],
-    []
+    [tableFilterState.pageSize, tableFilterState.page]
   );
 
   return (
-    <>
+    <div className='w-full'>
-      <div className='w-full p-0 sm:p-4'>
+      {/* Header Section */}
-        <div className='flex flex-col gap-2 mb-4'>
+      <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        {/* Action Buttons */}
-            <div className='w-full flex flex-row gap-2'></div>
+        <div className='w-fit flex flex-row gap-3 flex-wrap'>
+          <RequirePermission permissions='lti.inventory.product_stock.create'>
+            <Button
+              href='/inventory/product/add'
+              color='primary'
+              className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
+            >
+              <Icon icon='heroicons:plus' width={20} height={20} />
+              Add Product
+            </Button>
+          </RequirePermission>
         </div>
 
-          <div className='flex justify-between items-end gap-4'>
+        {/* Search */}
+        <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
           <DebouncedTextInput
             name='search'
-              placeholder='Cari Produk'
+            placeholder='Search'
-              value={tableFilterState.search}
+            value={tableFilterState.search ?? ''}
             onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+            startAdornment={
-            />
+              <Icon icon='heroicons:magnifying-glass' width={20} height={20} />
-            <SelectInput
+            }
-              label='Baris'
-              options={ROWS_OPTIONS}
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
-              }}
-              onChange={pageSizeChangeHandler}
             className={{
-                wrapper:
+              wrapper: 'w-full min-w-24 max-w-3xs',
-                  'col-span-6 sm:col-span-4 max-w-28 sm:justify-self-end',
+              inputWrapper: 'rounded-xl! shadow-button-soft',
+              input:
+                'placeholder:font-semibold placeholder:text-base-content/50',
             }}
           />
         </div>
       </div>
 
+      {/* Table Section */}
+      <div className='flex flex-col mb-4'>
+        {isLoading ? (
+          <div className='w-full flex flex-row justify-center items-center p-4'>
+            <span className='loading loading-spinner loading-xl' />
+          </div>
+        ) : !isResponseSuccess(inventoryProducts) ||
+          inventoryProducts.data?.length === 0 ? (
+          <div className='p-3'>
+            <InventoryProductTableSkeleton
+              columns={columns}
+              icon={
+                <Icon
+                  icon='heroicons:document-text'
+                  className='text-white'
+                  width={20}
+                  height={20}
+                />
+              }
+            />
+          </div>
+        ) : (
           <Table<InventoryProduct>
             data={
-            isResponseSuccess(inventoryProducts) ? inventoryProducts?.data : []
+              isResponseSuccess(inventoryProducts)
+                ? inventoryProducts?.data
+                : []
             }
             columns={columns}
             pageSize={tableFilterState.pageSize}
@@ -204,27 +260,18 @@ const InventoryProductTable = () => {
                 : 0
             }
             onPageChange={setPage}
+            onPageSizeChange={setPageSize}
             isLoading={isLoading}
             sorting={sorting}
             setSorting={setSorting}
             className={{
-            containerClassName: cn({
+              containerClassName: cn('p-3 mb-0'),
-              'mb-20':
+              headerColumnClassName: 'text-nowrap',
-                isResponseSuccess(inventoryProducts) &&
-                inventoryProducts?.data?.length === 0,
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
             }}
           />
+        )}
+      </div>
     </div>
-    </>
   );
 };
 

src/components/pages/inventory/product/skeleton/InventoryProductTableSkeleton.tsx

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

src/components/pages/marketing/DeliveryOrderFormModal.tsx

@@ -1,7 +1,6 @@
 'use client';
 
 import AlertErrorList from '@/components/helper/form/FormErrors';
-import { OptionType } from '@/components/input/SelectInput';
 import Modal, { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import { DeliveryOrderProductFormValues } from '@/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.schema';
@@ -112,16 +111,34 @@ const DeliveryOrderFormModal = ({}: { initialValues?: Marketing }) => {
     useState<DeliveryOrderProductFormValues | null>(null);
   const [deliveryOrderValues, setDeliveryOrderValues] = useState<
     DeliveryOrderProductFormValues[]
-  >(
+  >([]);
-    isResponseSuccess(marketing)
+
-      ? mergeSOwithDO(
+  const getDeliveryOrderValues = useCallback(
-          marketing?.data.sales_order?.map(SalesProductToFieldValues) ?? [],
+    (marketingData: Marketing): DeliveryOrderProductFormValues[] => {
-          marketing?.data.delivery_order?.flatMap((delivery) =>
+      const hasDeliveryOrder =
-            DeliveryProductToFieldValues(marketing.data.sales_order, delivery)
+        marketingData.delivery_order &&
+        marketingData.delivery_order.length > 0 &&
+        marketingData.delivery_order.some(
+          (doItem) => doItem.deliveries && doItem.deliveries.length > 0
+        );
+
+      if (hasDeliveryOrder) {
+        return (
+          marketingData.delivery_order?.flatMap((delivery) =>
+            DeliveryProductToFieldValues(marketingData.sales_order, delivery)
+          ) ?? []
+        );
+      }
+
+      return mergeSOwithDO(
+        marketingData.sales_order?.map(SalesProductToFieldValues) ?? [],
+        marketingData.delivery_order?.flatMap((delivery) =>
+          DeliveryProductToFieldValues(marketingData.sales_order, delivery)
         ) ?? [],
         true
-        )
+      );
-      : []
+    },
+    []
   );
 
   // ================== SETUP FORMIK ==================
@@ -130,14 +147,8 @@ const DeliveryOrderFormModal = ({}: { initialValues?: Marketing }) => {
   >(() => {
     if (!isResponseSuccess(marketing))
       return {} as SalesOrderFormValues & DeliveryOrderFormValues;
-    const deliveryValues = mergeSOwithDO(
-      marketing?.data.sales_order?.map(SalesProductToFieldValues) ?? [],
-      marketing?.data.delivery_order?.flatMap((delivery) =>
-        DeliveryProductToFieldValues(marketing.data.sales_order, delivery)
-      ) ?? [],
-      true
-    );
 
+    const deliveryValues = getDeliveryOrderValues(marketing.data);
     setDeliveryOrderValues(deliveryValues);
 
     return {
@@ -163,7 +174,7 @@ const DeliveryOrderFormModal = ({}: { initialValues?: Marketing }) => {
         ) ?? [],
       delivery_order: deliveryValues,
     };
-  }, [marketing]);
+  }, [marketing, getDeliveryOrderValues]);
 
   const formik = useFormik<SalesOrderFormValues & DeliveryOrderFormValues>({
     enableReinitialize: true,
@@ -648,9 +659,8 @@ const DeliveryOrderFormModal = ({}: { initialValues?: Marketing }) => {
                         <tr>
                           <td className='text-sm px-4 py-3'>No. Order</td>
                           <td className='text-sm px-4 py-3'>
-                            {marketing.data.do_number
+                            {marketing.data.do_number ||
-                              ? marketing.data.do_number
+                              marketing.data.so_number}
-                              : marketing.data.so_number}
                           </td>
                         </tr>
                         <tr>
@@ -765,6 +775,7 @@ const DeliveryOrderFormModal = ({}: { initialValues?: Marketing }) => {
                     <MemoizedDeliveryOrderProductForm
                       formState={'edit'}
                       salesOrders={marketing?.data?.sales_order ?? []}
+                      deliveryOrders={marketing?.data?.delivery_order ?? []}
                       exisitingValues={deliveryOrderValues}
                       onSubmitForm={handleAddSubmitDO}
                       initialValues={selectedDeliveryProduct ?? undefined}

src/components/pages/marketing/MarketingTable.tsx

@@ -30,6 +30,8 @@ import PopoverButton from '@/components/popover/PopoverButton';
 import PopoverContent from '@/components/popover/PopoverContent';
 import StatusBadge from '@/components/helper/StatusBadge';
 import MarketingFilterModal from '@/components/pages/marketing/MarketingFilter';
+import ButtonFilter from '@/components/helper/ButtonFilter';
+import MarketingTableSkeleton from '@/components/pages/marketing/skeleton/MarketingTableSkeleton';
 
 const RowsOptionsMenu = ({
   props,
@@ -214,32 +216,6 @@ const MarketingTable = () => {
     updateFilter('customer_id', '');
   };
 
-  // ===== ACTIVE FILTERS COUNT =====
-  const activeFiltersCount = useMemo(() => {
-    let count = 0;
-
-    // Product filter
-    if (tableFilterState.product_ids) {
-      count += 1;
-    }
-
-    // Status filter
-    if (tableFilterState.status) {
-      count += 1;
-    }
-
-    // Customer filter
-    if (tableFilterState.customer_id) {
-      count += 1;
-    }
-
-    return count;
-  }, [
-    tableFilterState.product_ids,
-    tableFilterState.status,
-    tableFilterState.customer_id,
-  ]);
-
   const approveClickHandler = () => {
     setApproveAction('APPROVED');
     confirmationModal.openModal();
@@ -588,28 +564,14 @@ const MarketingTable = () => {
             )}
           </div>
           <div className='flex flex-row gap-3'>
-            <Button
+            <ButtonFilter
-              variant='outline'
+              values={tableFilterState}
-              color='none'
+              excludeFields={['page', 'pageSize', 'search']}
               onClick={() => {
                 filterModal.openModal();
               }}
-              className={cn(
+              className='px-3 py-2.5'
-                'px-3 py-2.5 gap-1.5 text-sm text-base-content/50 border border-base-content/10 rounded-xl shadow-button-soft transition-all',
+            />
-                {
-                  'border-primary-gradient text-primary':
-                    activeFiltersCount > 0,
-                }
-              )}
-            >
-              <Icon icon='heroicons:funnel' width={20} height={20} />
-              Filter
-              {activeFiltersCount > 0 && (
-                <span className='w-5 h-5 text-white bg-[#FF3535] rounded-lg border border-base-300 flex items-center justify-center text-xs'>
-                  {activeFiltersCount}
-                </span>
-              )}
-            </Button>
             <Dropdown
               align='end'
               direction='bottom'
@@ -655,6 +617,26 @@ const MarketingTable = () => {
             </Dropdown>
           </div>
         </div>
+        <div className='flex flex-col mb-4'>
+          {isLoadingMarketing ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(marketing) || marketing.data?.length === 0 ? (
+            <div className='p-3'>
+              <MarketingTableSkeleton
+                columns={columns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table
               rowSelection={rowSelection}
               setRowSelection={setRowSelection}
@@ -665,18 +647,19 @@ const MarketingTable = () => {
               pageSize={tableFilterState.pageSize}
               page={isResponseSuccess(marketing) ? marketing?.meta?.page : 1}
               totalItems={
-            isResponseSuccess(marketing) ? marketing?.meta?.total_results : 0
+                isResponseSuccess(marketing)
+                  ? marketing?.meta?.total_results
+                  : 0
               }
               isLoading={isLoadingMarketing}
               className={{
-            containerClassName: cn('p-3', {
+                containerClassName: cn('p-3 mb-0'),
-              'w-full mb-20':
-                isResponseSuccess(marketing) && marketing?.data?.length === 0,
-            }),
                 bodyColumnClassName:
                   'last:text-end last:w-17 first:text-start first:w-5',
               }}
             />
+          )}
+        </div>
       </div>
       <ConfirmationModal
         ref={deleteModal.ref}

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

@@ -10,7 +10,10 @@ import NumberInput from '@/components/input/NumberInput';
 import PatternInput from '@/components/input/PatternInput';
 import { formatTitleCase, formatVechicleNumber } from '@/lib/helper';
 import DateInput from '@/components/input/DateInput';
-import { BaseSalesOrder } from '@/types/api/marketing/marketing';
+import {
+  BaseSalesOrder,
+  BaseDeliveryOrder,
+} from '@/types/api/marketing/marketing';
 import { SalesProductToFieldValues } from '@/components/pages/marketing/form/MarketingForm.schema';
 import * as Yup from 'yup';
 import { isResponseSuccess } from '@/lib/api-helper';
@@ -32,6 +35,7 @@ import { handleMarketingCalculation } from '@/lib/marketing-calculation';
 const DeliveryOrderProductForm = ({
   formState,
   salesOrders,
+  deliveryOrders,
   initialValues,
   exisitingValues,
   onUpdateForm,
@@ -39,6 +43,7 @@ const DeliveryOrderProductForm = ({
 }: {
   formState: 'add' | 'edit';
   salesOrders: BaseSalesOrder[];
+  deliveryOrders?: BaseDeliveryOrder[];
   initialValues?: DeliveryOrderProductFormValues;
   exisitingValues?: DeliveryOrderProductFormValues[];
   onSubmitForm?: (value: DeliveryOrderProductFormValues) => Promise<void>;
@@ -115,6 +120,36 @@ const DeliveryOrderProductForm = ({
     })
     ?.filter((item) => item != null) as OptionType[];
 
+  const hasDeliveryOrder = useMemo(() => {
+    return (
+      deliveryOrders &&
+      deliveryOrders.length > 0 &&
+      deliveryOrders.some(
+        (doItem) => doItem.deliveries && doItem.deliveries.length > 0
+      )
+    );
+  }, [deliveryOrders]);
+
+  const deliveryOrder = useMemo(() => {
+    if (!hasDeliveryOrder || !deliveryOrders) return null;
+
+    for (const doItem of deliveryOrders) {
+      const found = doItem.deliveries.find(
+        (d) =>
+          d.product_warehouse.id ===
+          initialValues?.marketing_product?.product_warehouse_id
+      );
+      if (found) {
+        return {
+          ...found,
+          delivery_date: doItem.delivery_date,
+          do_number: doItem.do_number,
+        };
+      }
+    }
+    return null;
+  }, [deliveryOrders, hasDeliveryOrder, initialValues]);
+
   const salesOrder = salesOrders.find(
     (item) => item.id === initialValues?.marketing_product_id
   );
@@ -122,15 +157,25 @@ const DeliveryOrderProductForm = ({
   const formik = useFormik<DeliveryOrderProductFormValues>({
     enableReinitialize: true,
     initialValues: {
-      delivery_date: initialValues?.delivery_date || undefined,
+      delivery_date:
-      vehicle_number: initialValues?.vehicle_number || undefined,
+        deliveryOrder?.delivery_date ||
+        initialValues?.delivery_date ||
+        undefined,
+      vehicle_number:
+        deliveryOrder?.vehicle_number ||
+        initialValues?.vehicle_number ||
+        undefined,
       marketing_product_id:
         salesOrder?.id || initialValues?.marketing_product_id || undefined,
-      unit_price: initialValues?.unit_price || undefined,
+      unit_price:
-      total_weight: initialValues?.total_weight || undefined,
+        deliveryOrder?.unit_price ?? initialValues?.unit_price ?? undefined,
-      qty: initialValues?.qty || undefined,
+      total_weight:
-      avg_weight: initialValues?.avg_weight || undefined,
+        deliveryOrder?.total_weight ?? initialValues?.total_weight ?? undefined,
-      total_price: initialValues?.total_price || undefined,
+      qty: deliveryOrder?.qty ?? initialValues?.qty ?? undefined,
+      avg_weight:
+        deliveryOrder?.avg_weight ?? initialValues?.avg_weight ?? undefined,
+      total_price:
+        deliveryOrder?.total_price ?? initialValues?.total_price ?? undefined,
       marketing_product: initialValues?.marketing_product || undefined,
       uom: initialValues?.uom || '',
       weight_per_convertion:
@@ -236,6 +281,25 @@ const DeliveryOrderProductForm = ({
     });
   };
 
+  // Handler untuk onChange - auto calculation real-time untuk field yang mempengaruhi total_price (total_peti, weight_per_convertion, price_per_convertion, sisa_berat, price_sisa_berat, price_per_qty, qty)
+  const handleFieldChange = (
+    field: string,
+    value: number | string,
+    callback?: () => void
+  ) => {
+    formik.setFieldValue(field, value);
+
+    setTimeout(() => {
+      handleMarketingCalculation(field, {
+        values: { ...formik.values, [field]: value },
+        setFieldValue: formik.setFieldValue,
+        hasSisaBerat,
+      });
+    }, 0);
+
+    if (callback) callback();
+  };
+
   // Handler khusus untuk toggle sisa berat - langsung pakai nilai baru
   const handleSisaBeratToggle = (newHasSisaBerat: boolean) => {
     setHasSisaBerat(newHasSisaBerat);
@@ -520,13 +584,11 @@ const DeliveryOrderProductForm = ({
                     } per ${formik.values.convertion_unit?.value}`}
                     value={formik.values.weight_per_convertion ?? ''}
                     onChange={(e) => {
-                      formik.setFieldValue(
+                      const value = Number(e.target.value);
-                        'weight_per_convertion',
+                      handleFieldChange('weight_per_convertion', value, () =>
-                        Number(e.target.value)
+                        setCurrentInput(e.target.name)
                       );
-                      setCurrentInput(e.target.name);
                     }}
-                    onBlur={() => handleBlurField('weight_per_convertion')}
                   />
                 </div>
               </div>
@@ -564,10 +626,11 @@ const DeliveryOrderProductForm = ({
               name='total_peti'
               value={formik.values.total_peti ?? undefined}
               onChange={(e) => {
-                formik.handleChange(e);
+                const value = Number(e.target.value);
-                setCurrentInput(e.target.name);
+                handleFieldChange('total_peti', value, () =>
+                  setCurrentInput(e.target.name)
+                );
               }}
-              onBlur={() => handleBlurField('total_peti')}
               isError={
                 formik.touched.total_peti && Boolean(formik.errors.total_peti)
               }
@@ -592,10 +655,11 @@ const DeliveryOrderProductForm = ({
                   name='avg_weight'
                   value={formik.values.avg_weight}
                   onChange={(e) => {
-                    formik.handleChange(e);
+                    const value = Number(e.target.value);
-                    setCurrentInput(e.target.name);
+                    handleFieldChange('avg_weight', value, () =>
+                      setCurrentInput('avg_weight')
+                    );
                   }}
-                  onBlur={() => handleBlurField('avg_weight')}
                   isError={
                     formik.touched.avg_weight &&
                     Boolean(formik.errors.avg_weight)
@@ -613,10 +677,11 @@ const DeliveryOrderProductForm = ({
               name='total_weight'
               value={formik.values.total_weight}
               onChange={(e) => {
-                formik.handleChange(e);
+                const value = Number(e.target.value);
-                setCurrentInput(e.target.name);
+                handleFieldChange('total_weight', value, () =>
+                  setCurrentInput('total_weight')
+                );
               }}
-              onBlur={() => handleBlurField('total_weight')}
               isError={
                 formik.touched.total_weight &&
                 Boolean(formik.errors.total_weight)
@@ -638,10 +703,11 @@ const DeliveryOrderProductForm = ({
             name='qty'
             value={formik.values.qty}
             onChange={(e) => {
-              formik.handleChange(e);
+              const value = Number(e.target.value);
-              setCurrentInput(e.target.name);
+              handleFieldChange('qty', value, () =>
+                setCurrentInput(e.target.name)
+              );
             }}
-            onBlur={() => handleBlurField('qty')}
             isError={Boolean(formik.errors.qty)}
             errorMessage={formik.errors.qty}
             placeholder='Masukan Kuantitas'
@@ -677,10 +743,11 @@ const DeliveryOrderProductForm = ({
               name='price_per_convertion'
               value={formik.values.price_per_convertion ?? undefined}
               onChange={(e) => {
-                formik.handleChange(e);
+                const value = Number(e.target.value);
-                setCurrentInput(e.target.name);
+                handleFieldChange('price_per_convertion', value, () =>
+                  setCurrentInput(e.target.name)
+                );
               }}
-              onBlur={() => handleBlurField('price_per_convertion')}
               isError={
                 formik.touched.price_per_convertion &&
                 Boolean(formik.errors.price_per_convertion)
@@ -699,10 +766,11 @@ const DeliveryOrderProductForm = ({
                 name='price_per_qty'
                 value={formik.values.price_per_qty ?? undefined}
                 onChange={(e) => {
-                  formik.setFieldValue('price_per_qty', Number(e.target.value));
+                  const value = Number(e.target.value);
-                  setCurrentInput('price_per_qty');
+                  handleFieldChange('price_per_qty', value, () =>
+                    setCurrentInput('price_per_qty')
+                  );
                 }}
-                onBlur={() => handleBlurField('price_per_qty')}
                 isError={
                   formik.touched.price_per_qty &&
                   Boolean(formik.errors.price_per_qty)
@@ -721,10 +789,11 @@ const DeliveryOrderProductForm = ({
                 name='unit_price'
                 value={formik.values.unit_price}
                 onChange={(e) => {
-                  formik.handleChange(e);
+                  const value = Number(e.target.value);
-                  setCurrentInput(e.target.name);
+                  handleFieldChange('unit_price', value, () =>
+                    setCurrentInput(e.target.name)
+                  );
                 }}
-                onBlur={() => handleBlurField('unit_price')}
                 isError={Boolean(formik.errors.unit_price)}
                 errorMessage={formik.errors.unit_price}
                 placeholder='Masukan Harga Satuan'
@@ -760,10 +829,11 @@ const DeliveryOrderProductForm = ({
                 name='sisa_berat'
                 value={formik.values.sisa_berat ?? undefined}
                 onChange={(e) => {
-                  formik.handleChange(e);
+                  const value = Number(e.target.value);
-                  setCurrentInput(e.target.name);
+                  handleFieldChange('sisa_berat', value, () =>
+                    setCurrentInput(e.target.name)
+                  );
                 }}
-                onBlur={() => handleBlurField('sisa_berat')}
                 isError={
                   formik.touched.sisa_berat && Boolean(formik.errors.sisa_berat)
                 }
@@ -776,10 +846,11 @@ const DeliveryOrderProductForm = ({
                 name='price_sisa_berat'
                 value={formik.values.price_sisa_berat ?? undefined}
                 onChange={(e) => {
-                  formik.handleChange(e);
+                  const value = Number(e.target.value);
-                  setCurrentInput(e.target.name);
+                  handleFieldChange('price_sisa_berat', value, () =>
+                    setCurrentInput(e.target.name)
+                  );
                 }}
-                onBlur={() => handleBlurField('price_sisa_berat')}
                 isError={
                   formik.touched.price_sisa_berat &&
                   Boolean(formik.errors.price_sisa_berat)
@@ -797,10 +868,11 @@ const DeliveryOrderProductForm = ({
             name='total_price'
             value={formik.values.total_price}
             onChange={(e) => {
-              formik.handleChange(e);
+              const value = Number(e.target.value);
-              setCurrentInput(e.target.name);
+              handleFieldChange('total_price', value, () =>
+                setCurrentInput('total_price')
+              );
             }}
-            onBlur={() => handleBlurField('total_price')}
             isError={
               formik.touched.total_price && Boolean(formik.errors.total_price)
             }

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

@@ -250,6 +250,25 @@ const SalesOrderProductForm = ({
     });
   };
 
+  // Handler untuk onChange - auto calculation real-time untuk field yang mempengaruhi total_price (total_peti, weight_per_convertion, price_per_convertion, sisa_berat, price_sisa_berat, price_per_qty, qty)
+  const handleFieldChange = (
+    field: string,
+    value: number | string,
+    callback?: () => void
+  ) => {
+    formik.setFieldValue(field, value);
+
+    setTimeout(() => {
+      handleMarketingCalculation(field, {
+        values: { ...formik.values, [field]: value },
+        setFieldValue: formik.setFieldValue,
+        hasSisaBerat,
+      });
+    }, 0);
+
+    if (callback) callback();
+  };
+
   // Handler khusus untuk toggle sisa berat - langsung pakai nilai baru
   const handleSisaBeratToggle = (newHasSisaBerat: boolean) => {
     setHasSisaBerat(newHasSisaBerat);
@@ -475,13 +494,11 @@ const SalesOrderProductForm = ({
                     } per ${formik.values.convertion_unit?.value}`}
                     value={formik.values.weight_per_convertion ?? ''}
                     onChange={(e) => {
-                      formik.setFieldValue(
+                      const value = Number(e.target.value);
-                        'weight_per_convertion',
+                      handleFieldChange('weight_per_convertion', value, () =>
-                        Number(e.target.value)
+                        setCurrentInput(e.target.name)
                       );
-                      setCurrentInput(e.target.name);
                     }}
-                    onBlur={() => handleBlurField('weight_per_convertion')}
                   />
                 </div>
               </div>
@@ -519,10 +536,11 @@ const SalesOrderProductForm = ({
               name='total_peti'
               value={formik.values.total_peti ?? undefined}
               onChange={(e) => {
-                formik.handleChange(e);
+                const value = Number(e.target.value);
-                setCurrentInput(e.target.name);
+                handleFieldChange('total_peti', value, () =>
+                  setCurrentInput(e.target.name)
+                );
               }}
-              onBlur={() => handleBlurField('total_peti')}
               isError={
                 formik.touched.total_peti && Boolean(formik.errors.total_peti)
               }
@@ -547,10 +565,11 @@ const SalesOrderProductForm = ({
                   name='avg_weight'
                   value={formik.values.avg_weight}
                   onChange={(e) => {
-                    formik.handleChange(e);
+                    const value = Number(e.target.value);
-                    setCurrentInput(e.target.name);
+                    handleFieldChange('avg_weight', value, () =>
+                      setCurrentInput('avg_weight')
+                    );
                   }}
-                  onBlur={() => handleBlurField('avg_weight')}
                   isError={
                     formik.touched.avg_weight &&
                     Boolean(formik.errors.avg_weight)
@@ -568,10 +587,11 @@ const SalesOrderProductForm = ({
               name='total_weight'
               value={formik.values.total_weight}
               onChange={(e) => {
-                formik.handleChange(e);
+                const value = Number(e.target.value);
-                setCurrentInput(e.target.name);
+                handleFieldChange('total_weight', value, () =>
+                  setCurrentInput('total_weight')
+                );
               }}
-              onBlur={() => handleBlurField('total_weight')}
               isError={
                 formik.touched.total_weight &&
                 Boolean(formik.errors.total_weight)
@@ -593,10 +613,11 @@ const SalesOrderProductForm = ({
             name='qty'
             value={formik.values.qty}
             onChange={(e) => {
-              formik.handleChange(e);
+              const value = Number(e.target.value);
-              setCurrentInput(e.target.name);
+              handleFieldChange('qty', value, () =>
+                setCurrentInput(e.target.name)
+              );
             }}
-            onBlur={() => handleBlurField('qty')}
             isError={formik.touched.qty && Boolean(formik.errors.qty)}
             errorMessage={formik.errors.qty}
             placeholder='Masukan Kuantitas'
@@ -630,10 +651,11 @@ const SalesOrderProductForm = ({
               name='price_per_convertion'
               value={formik.values.price_per_convertion ?? undefined}
               onChange={(e) => {
-                formik.handleChange(e);
+                const value = Number(e.target.value);
-                setCurrentInput(e.target.name);
+                handleFieldChange('price_per_convertion', value, () =>
+                  setCurrentInput(e.target.name)
+                );
               }}
-              onBlur={() => handleBlurField('price_per_convertion')}
               isError={
                 formik.touched.price_per_convertion &&
                 Boolean(formik.errors.price_per_convertion)
@@ -652,10 +674,11 @@ const SalesOrderProductForm = ({
                 name='price_per_qty'
                 value={formik.values.price_per_qty ?? undefined}
                 onChange={(e) => {
-                  formik.setFieldValue('price_per_qty', Number(e.target.value));
+                  const value = Number(e.target.value);
-                  setCurrentInput('price_per_qty');
+                  handleFieldChange('price_per_qty', value, () =>
+                    setCurrentInput('price_per_qty')
+                  );
                 }}
-                onBlur={() => handleBlurField('price_per_qty')}
                 isError={
                   formik.touched.price_per_qty &&
                   Boolean(formik.errors.price_per_qty)
@@ -674,10 +697,11 @@ const SalesOrderProductForm = ({
                 name='unit_price'
                 value={formik.values.unit_price}
                 onChange={(e) => {
-                  formik.handleChange(e);
+                  const value = Number(e.target.value);
-                  setCurrentInput(e.target.name);
+                  handleFieldChange('unit_price', value, () =>
+                    setCurrentInput(e.target.name)
+                  );
                 }}
-                onBlur={() => handleBlurField('unit_price')}
                 isError={
                   formik.touched.unit_price && Boolean(formik.errors.unit_price)
                 }
@@ -715,10 +739,11 @@ const SalesOrderProductForm = ({
                 name='sisa_berat'
                 value={formik.values.sisa_berat ?? undefined}
                 onChange={(e) => {
-                  formik.handleChange(e);
+                  const value = Number(e.target.value);
-                  setCurrentInput(e.target.name);
+                  handleFieldChange('sisa_berat', value, () =>
+                    setCurrentInput(e.target.name)
+                  );
                 }}
-                onBlur={() => handleBlurField('sisa_berat')}
                 isError={
                   formik.touched.sisa_berat && Boolean(formik.errors.sisa_berat)
                 }
@@ -731,10 +756,11 @@ const SalesOrderProductForm = ({
                 name='price_sisa_berat'
                 value={formik.values.price_sisa_berat ?? undefined}
                 onChange={(e) => {
-                  formik.handleChange(e);
+                  const value = Number(e.target.value);
-                  setCurrentInput(e.target.name);
+                  handleFieldChange('price_sisa_berat', value, () =>
+                    setCurrentInput(e.target.name)
+                  );
                 }}
-                onBlur={() => handleBlurField('price_sisa_berat')}
                 isError={
                   formik.touched.price_sisa_berat &&
                   Boolean(formik.errors.price_sisa_berat)
@@ -752,10 +778,11 @@ const SalesOrderProductForm = ({
             name='total_price'
             value={formik.values.total_price}
             onChange={(e) => {
-              formik.handleChange(e);
+              const value = Number(e.target.value);
-              setCurrentInput(e.target.name);
+              handleFieldChange('total_price', value, () =>
+                setCurrentInput('total_price')
+              );
             }}
-            onBlur={() => handleBlurField('total_price')}
             isError={
               formik.touched.total_price && Boolean(formik.errors.total_price)
             }

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

@@ -2,10 +2,11 @@ import { DeliveryOrderProductFormValues } from '@/components/pages/marketing/for
 import Button from '@/components/Button';
 import Card from '@/components/Card';
 import { Icon } from '@iconify/react';
-import { useRef } from 'react';
+import { useRef, useMemo } from 'react';
 import { formatCurrency, formatDate, formatNumber } from '@/lib/helper';
 import DeliveryOrderExport from '@/components/pages/marketing/pdf/DeliveryOrderExport';
-import { Marketing } from '@/types/api/marketing/marketing';
+import { Marketing, BaseDelivery } from '@/types/api/marketing/marketing';
+import { Warehouse } from '@/types/api/master-data/warehouse';
 
 type DeliveryOrderProductTableProps = {
   data: DeliveryOrderProductFormValues[];
@@ -42,7 +43,31 @@ const DeliveryOrderProductTable = ({
 
   const approvalStepNumber = marketing?.latest_approval?.step_number;
 
-  const renderTableContent = (item: DeliveryOrderProductFormValues) => {
+  const hasDeliveryOrder = useMemo(() => {
+    return (
+      marketing?.delivery_order &&
+      marketing.delivery_order.length > 0 &&
+      marketing.delivery_order.some(
+        (doItem) => doItem.deliveries && doItem.deliveries.length > 0
+      )
+    );
+  }, [marketing?.delivery_order]);
+
+  const deliveryItems = useMemo(() => {
+    if (!hasDeliveryOrder) return [];
+    return (
+      marketing?.delivery_order?.flatMap((doItem) =>
+        doItem.deliveries.map((delivery) => ({
+          ...delivery,
+          do_number: doItem.do_number,
+          delivery_date: doItem.delivery_date,
+          warehouse: doItem.warehouse,
+        }))
+      ) ?? []
+    );
+  }, [marketing?.delivery_order, hasDeliveryOrder]);
+
+  const renderSalesOrderContent = (item: DeliveryOrderProductFormValues) => {
     const doItem = marketing?.delivery_order?.find(
       (doItem) => doItem.do_number === item.do_number
     );
@@ -185,10 +210,172 @@ const DeliveryOrderProductTable = ({
     );
   };
 
+  const renderDeliveryOrderContent = (
+    item: BaseDelivery & {
+      do_number: string;
+      delivery_date: string;
+      warehouse: Warehouse;
+    }
+  ) => {
+    const parentDoItem = marketing?.delivery_order?.find(
+      (doItem) => doItem.do_number === item.do_number
+    );
+
+    return (
+      <>
+        <tr className='border-b border-tools-table-outline border-base-content/5'>
+          <th className='w-1/3 text-start not-first:font-medium text-base-content/50 text-sm px-4 py-3'>
+            Label
+          </th>
+          <th className='text-start font-medium text-base-content/50 text-sm px-4 py-3'>
+            <div className='flex w-full flex-row gap-1 items-center justify-between h-full'>
+              <div>Value</div>
+            </div>
+          </th>
+        </tr>
+        <>
+          <tr>
+            <td className='text-sm px-4 py-3'>Gudang</td>
+            <td className='text-sm px-4 py-3'>{item.warehouse?.name}</td>
+          </tr>
+          <tr>
+            <td className='text-sm px-4 py-3'>Produk</td>
+            <td className='text-sm px-4 py-3'>
+              {item.product_warehouse?.product?.name}
+            </td>
+          </tr>
+          <tr>
+            <td className='text-sm px-4 py-3'>Qty</td>
+            <td className='text-sm px-4 py-3'>
+              {item.qty
+                ? `${formatNumber(item.qty)} ${item.product_warehouse?.product?.uom?.name ?? ''}`
+                : '-'}
+            </td>
+          </tr>
+          {Number(item.avg_weight ?? 0) > 0 && (
+            <tr>
+              <td className='text-sm px-4 py-3'>Avg Bobot</td>
+              <td className='text-sm px-4 py-3'>
+                {formatNumber(Number(item.avg_weight))} Kg
+              </td>
+            </tr>
+          )}
+          {Number(item.total_weight ?? 0) > 0 && (
+            <tr>
+              <td className='text-sm px-4 py-3'>Total Bobot</td>
+              <td className='text-sm px-4 py-3'>
+                {formatNumber(Number(item.total_weight))}
+              </td>
+            </tr>
+          )}
+          <tr>
+            <td className='text-sm px-4 py-3'>Total Harga Satuan</td>
+            <td className='text-sm px-4 py-3'>
+              {formatCurrency(item.unit_price)}
+            </td>
+          </tr>
+          <tr>
+            <td className='text-sm px-4 py-3'>Total Penjualan</td>
+            <td className='text-sm px-4 py-3'>
+              {formatCurrency(item.total_price)}
+            </td>
+          </tr>
+        </>
+        <tr className='border-b border-t border-tools-table-outline border-base-content/5'>
+          <th className='w-1/3 text-start not-first:font-medium text-base-content/50 text-sm px-4 py-3'>
+            Label
+          </th>
+          <th className='text-start font-medium text-base-content/50 text-sm px-4 py-3'>
+            <div className='flex w-full flex-row gap-1 items-center justify-between h-full'>
+              <div>Value</div>
+            </div>
+          </th>
+        </tr>
+        <>
+          {approvalStepNumber !== 1 && (
+            <tr>
+              <td className='text-sm px-4 py-3'>Tanggal Pengiriman</td>
+              <td className='text-sm px-4 py-3'>
+                {item.delivery_date
+                  ? formatDate(item.delivery_date, 'DD MMM YYYY')
+                  : '-'}
+              </td>
+            </tr>
+          )}
+          {item.do_number && (
+            <tr>
+              <td className='text-sm px-4 py-3'>No. Pengiriman</td>
+              <td className='text-sm px-4 py-3'>{item.do_number}</td>
+            </tr>
+          )}
+          <tr>
+            <td className='text-sm px-4 py-3'>No. Polisi</td>
+            <td className='text-sm px-4 py-3'>{item.vehicle_number}</td>
+          </tr>
+          {parentDoItem && (
+            <tr>
+              <td className='text-sm px-4 py-3'>Dokumen Pengiriman</td>
+              <td className='text-sm px-4 py-3'>
+                <DeliveryOrderExport
+                  data={marketing}
+                  deliveryOrder={parentDoItem}
+                />
+              </td>
+            </tr>
+          )}
+        </>
+      </>
+    );
+  };
+
   return (
     <>
       <div className='size-full flex flex-col relative overflow-x-hidden gap-3'>
-        {data.map((item) => (
+        {hasDeliveryOrder
+          ? deliveryItems.map((item, index) => (
+              <div key={`do-table-${item.product_warehouse?.id}-${index}`}>
+                {formType === 'success' ? (
+                  <div className='rounded-lg border border-tools-table-outline border-base-content/5'>
+                    <table
+                      style={{
+                        borderRadius: '0.5rem',
+                      }}
+                      className='border-none w-full'
+                    >
+                      <tbody className='w-full'>
+                        {renderDeliveryOrderContent(item)}
+                      </tbody>
+                    </table>
+                  </div>
+                ) : (
+                  <Card
+                    key={`do-table-${item.product_warehouse?.id}-${index}`}
+                    title={item.product_warehouse?.product?.name || 'Produk'}
+                    collapsible={true}
+                    defaultCollapsed={false}
+                    variant='bordered'
+                    className={{
+                      wrapper: 'w-full rounded-lg',
+                      body: 'p-0',
+                      title: 'px-2 py-1.5 font-normal text-sm',
+                      collapsible: 'rounded-lg',
+                    }}
+                  >
+                    <table
+                      style={{
+                        borderRadius: '0.5rem',
+                      }}
+                      className='border-none w-full'
+                    >
+                      <tbody className='w-full'>
+                        {renderDeliveryOrderContent(item)}
+                      </tbody>
+                    </table>
+                  </Card>
+                )}
+              </div>
+            ))
+          : data.map((item) => (
               <div key={`table-${item.id}`}>
                 {formType === 'success' ? (
                   <div className='rounded-lg border border-tools-table-outline border-base-content/5'>
@@ -198,14 +385,17 @@ const DeliveryOrderProductTable = ({
                       }}
                       className='border-none w-full'
                     >
-                  <tbody className='w-full'>{renderTableContent(item)}</tbody>
+                      <tbody className='w-full'>
+                        {renderSalesOrderContent(item)}
+                      </tbody>
                     </table>
                   </div>
                 ) : (
                   <Card
                     key={`table-${item.id}`}
                     title={
-                  item.marketing_product?.product_warehouse?.label || 'Produk'
+                      item.marketing_product?.product_warehouse?.label ||
+                      'Produk'
                     }
                     collapsible={true}
                     defaultCollapsed={false}
@@ -223,7 +413,9 @@ const DeliveryOrderProductTable = ({
                       }}
                       className='border-none w-full'
                     >
-                  <tbody className='w-full'>{renderTableContent(item)}</tbody>
+                      <tbody className='w-full'>
+                        {renderSalesOrderContent(item)}
+                      </tbody>
                     </table>
                   </Card>
                 )}

src/components/pages/marketing/pdf/DeliveryOrderExport.tsx

@@ -1,7 +1,7 @@
 import Button from '@/components/Button';
 import { BaseDeliveryOrder, Marketing } from '@/types/api/marketing/marketing';
 import { Icon } from '@iconify/react';
-import { Document, Image, Page, pdf, Text, View } from '@react-pdf/renderer';
+import { Document, Page, pdf, Text, View } from '@react-pdf/renderer';
 import { useMemo, useState } from 'react';
 import { formatDate, formatNumber, formatVechicleNumber } from '@/lib/helper';
 import pdfStyles from '@/components/pages/marketing/pdf/styles/MarketingPDFStyles';

src/components/pages/marketing/skeleton/MarketingTableSkeleton.tsx

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

src/components/pages/master-data/area/AreasTable.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { ChangeEventHandler, useEffect, useState } from 'react';
+import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
 import useSWR from 'swr';
 import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 import toast from 'react-hot-toast';
@@ -11,75 +11,101 @@ import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import Button from '@/components/Button';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
+import PopoverButton from '@/components/popover/PopoverButton';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
+import PopoverContent from '@/components/popover/PopoverContent';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RequirePermission from '@/components/helper/RequirePermission';
+import AreaTableSkeleton from '@/components/pages/master-data/area/skeleton/AreaTableSkeleton';
 
 import { Area } from '@/types/api/master-data/area';
 import { AreaApi } from '@/services/api/master-data';
-import { cn } from '@/lib/helper';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { ROWS_OPTIONS } from '@/config/constant';
+import { usePathname } from 'next/navigation';
+import { useUiStore } from '@/stores/ui/ui.store';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Area, unknown>;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `area#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-area#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.master.area.detail'>
             <Button
               href={`/master-data/area/detail/?areaId=${props.row.original.id}`}
               variant='ghost'
-          color='primary'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.area.update'>
             <Button
               href={`/master-data/area/detail/edit/?areaId=${props.row.original.id}`}
               variant='ghost'
-          color='warning'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+              <Icon icon='heroicons:pencil-square' width={20} height={20} />
               Edit
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.area.delete'>
             <Button
-          onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
-          color='error'
+              color='none'
-          className='text-error hover:text-inherit'
+              className='p-3 justify-start text-sm font-semibold w-full text-error hover:text-error'
             >
-          <Icon
+              <Icon icon='heroicons:trash' width={20} height={20} />
-            icon='material-symbols:delete-outline-rounded'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Delete
             </Button>
           </RequirePermission>
-    </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
 const AreasTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -87,10 +113,17 @@ const AreasTable = () => {
     setPageSize,
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
-    initial: { search: '', nameSort: '' },
+    initial: {
-    paramMap: { page: 'page', pageSize: 'limit', nameSort: 'sort_name' },
+      search: searchValue,
+    },
+    paramMap: {
+      page: 'page',
+      pageSize: 'limit',
+    },
   });
 
+  const [sorting, setSorting] = useState<SortingState>([]);
+
   const {
     data: areas,
     isLoading,
@@ -101,66 +134,22 @@ const AreasTable = () => {
   );
 
   const deleteModal = useModal();
-
   const [selectedArea, setSelectedArea] = useState<Area | undefined>(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
-  const [sorting, setSorting] = useState<SortingState>([]);
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
 
-  const areasColumns: ColumnDef<Area>[] = [
+  useEffect(() => {
-    {
+    setTableState('areas-table', pathname);
-      header: '#',
+  }, [pathname, setTableState]);
-      cell: (props) =>
-        tableFilterState.pageSize * (tableFilterState.page - 1) +
-        props.row.index +
-        1,
-    },
-    {
-      accessorKey: 'name',
-      header: 'Nama',
-    },
-    {
-      header: 'Aksi',
-      cell: (props) => {
-        const currentPageSize = props.table.getPaginationRowModel().rows.length;
-        const currentPageRows = props.table.getPaginationRowModel().flatRows;
-        const currentRowRelativeIndex =
-          currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-
+    setSearchValue(e.target.value);
-        const deleteClickHandler = () => {
+    updateFilter('search', e.target.value);
-          setSelectedArea(props.row.original);
-          deleteModal.openModal();
   };
 
-        return (
-          <>
-            {currentPageSize > 2 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                <RowOptionsMenu
-                  type='dropdown'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowDropdownOptions>
-            )}
-
-            {currentPageSize <= 2 && (
-              <RowCollapseOptions>
-                <RowOptionsMenu
-                  type='collapse'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowCollapseOptions>
-            )}
-          </>
-        );
-      },
-    },
-  ];
-
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
@@ -179,95 +168,132 @@ const AreasTable = () => {
     setIsDeleteLoading(false);
   };
 
-  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+  const areasColumns: ColumnDef<Area>[] = useMemo(
-    updateFilter('search', e.target.value);
+    () => [
+      {
+        header: 'No',
+        cell: (props) =>
+          tableFilterState.pageSize * (tableFilterState.page - 1) +
+          props.row.index +
+          1,
+      },
+      {
+        accessorKey: 'name',
+        header: 'Nama',
+      },
+      {
+        header: 'Aksi',
+        cell: (props: CellContext<Area, unknown>) => {
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
+          const currentPageRows = props.table.getPaginationRowModel().flatRows;
+          const currentRowRelativeIndex =
+            currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
+
+          const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+
+          const deleteClickHandler = () => {
+            setSelectedArea(props.row.original);
+            deleteModal.openModal();
           };
 
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+          return (
-    const newVal = val as OptionType;
+            <RowOptionsMenu
-
+              props={props}
-    setPageSize(newVal.value as number);
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
-  };
+              deleteClickHandler={deleteClickHandler}
-
+            />
-  // track sorting
+          );
-  useEffect(() => {
+        },
-    const isNameSorted = sorting.find((sortItem) => sortItem.id === 'name');
+      },
-
+    ],
-    if (!isNameSorted) {
+    [tableFilterState.pageSize, tableFilterState.page, deleteModal]
-      updateFilter('nameSort', '');
+  );
-    } else {
-      updateFilter('nameSort', isNameSorted.desc ? 'desc' : 'asc');
-    }
-  }, [sorting, updateFilter]);
 
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row'>
+          {/* Action Buttons */}
-              <div className='w-full flex flex-row'>
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.master.area.create'>
               <Button
                 href='/master-data/area/add'
-                    variant='outline'
                 color='primary'
-                    className='w-full sm:w-fit'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-                    <Icon icon='ic:round-plus' width={24} height={24} />
+                <Icon icon='heroicons:plus' width={20} height={20} />
-                    Tambah
+                Add Area
               </Button>
             </RequirePermission>
           </div>
-            </div>
 
+          {/* Search */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-              placeholder='Cari Area'
+              placeholder='Search'
-              value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
                 />
-          </div>
+              }
-
+              className={{
-          <div className='flex flex-row justify-end'>
+                wrapper: 'w-full min-w-24 max-w-3xs',
-            <SelectInput
+                inputWrapper: 'rounded-xl! shadow-button-soft',
-              label='Baris'
+                input:
-              options={ROWS_OPTIONS}
+                  'placeholder:font-semibold placeholder:text-base-content/50',
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
               }}
-              onChange={pageSizeChangeHandler}
-              className={{ wrapper: 'max-w-28' }}
             />
           </div>
         </div>
 
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(areas) || areas.data?.length === 0 ? (
+            <div className='p-3'>
+              <AreaTableSkeleton
+                columns={areasColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<Area>
               data={isResponseSuccess(areas) ? areas?.data : []}
               columns={areasColumns}
               pageSize={tableFilterState.pageSize}
               page={isResponseSuccess(areas) ? areas?.meta?.page : 0}
-          totalItems={isResponseSuccess(areas) ? areas?.meta?.total_results : 0}
+              totalItems={
+                isResponseSuccess(areas) ? areas?.meta?.total_results : 0
+              }
               onPageChange={setPage}
+              onPageSizeChange={setPageSize}
               isLoading={isLoading}
               sorting={sorting}
               setSorting={setSorting}
               className={{
-            containerClassName: cn({
+                containerClassName: 'p-3 mb-0',
-              'mb-20': isResponseSuccess(areas) && areas?.data?.length === 0,
+                headerColumnClassName: 'text-nowrap',
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
+        </div>
       </div>
 
       <ConfirmationModal

src/components/pages/master-data/area/skeleton/AreaTableSkeleton.tsx

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

src/components/pages/master-data/bank/BanksTable.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { ChangeEventHandler, useEffect, useState } from 'react';
+import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
 import useSWR from 'swr';
 import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 import toast from 'react-hot-toast';
@@ -11,75 +11,101 @@ import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import Button from '@/components/Button';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RequirePermission from '@/components/helper/RequirePermission';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
+import BankTableSkeleton from '@/components/pages/master-data/bank/skeleton/BankTableSkeleton';
 
 import { Bank } from '@/types/api/master-data/bank';
 import { BankApi } from '@/services/api/master-data';
-import { cn } from '@/lib/helper';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { ROWS_OPTIONS } from '@/config/constant';
+import { usePathname } from 'next/navigation';
+import { useUiStore } from '@/stores/ui/ui.store';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Bank, unknown>;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `bank#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-bank#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.master.banks.detail'>
             <Button
               href={`/master-data/bank/detail/?bankId=${props.row.original.id}`}
               variant='ghost'
-          color='primary'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.banks.update'>
             <Button
               href={`/master-data/bank/detail/edit/?bankId=${props.row.original.id}`}
               variant='ghost'
-          color='warning'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+              <Icon icon='heroicons:pencil-square' width={20} height={20} />
               Edit
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.banks.delete'>
             <Button
-          onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
-          color='error'
+              color='none'
-          className='justify-start text-sm text-error focus-visible:text-error-content hover:text-error-content'
+              className='p-3 justify-start text-sm font-semibold w-full text-error hover:text-error'
             >
-          <Icon
+              <Icon icon='heroicons:trash' width={20} height={20} />
-            icon='material-symbols:delete-outline-rounded'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Delete
             </Button>
           </RequirePermission>
-    </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
 const BanksTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -87,10 +113,17 @@ const BanksTable = () => {
     setPageSize,
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
-    initial: { search: '', nameSort: '' },
+    initial: {
-    paramMap: { page: 'page', pageSize: 'limit', nameSort: 'sort_name' },
+      search: searchValue,
+    },
+    paramMap: {
+      page: 'page',
+      pageSize: 'limit',
+    },
   });
 
+  const [sorting, setSorting] = useState<SortingState>([]);
+
   const {
     data: banks,
     isLoading,
@@ -101,15 +134,44 @@ const BanksTable = () => {
   );
 
   const deleteModal = useModal();
-
   const [selectedBank, setSelectedBank] = useState<Bank | undefined>(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
-  const [sorting, setSorting] = useState<SortingState>([]);
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
 
-  const banksColumns: ColumnDef<Bank>[] = [
+  useEffect(() => {
+    setTableState('banks-table', pathname);
+  }, [pathname, setTableState]);
+
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
+  };
+
+  const confirmationModalDeleteClickHandler = async () => {
+    setIsDeleteLoading(true);
+
+    const deleteResponse = await BankApi.delete(selectedBank?.id as number);
+
+    if (isResponseError(deleteResponse)) {
+      toast.error(deleteResponse.message);
+      setIsDeleteLoading(false);
+      return;
+    }
+
+    refreshBanks();
+
+    deleteModal.closeModal();
+    toast.success('Successfully delete Bank!');
+    setIsDeleteLoading(false);
+  };
+
+  const banksColumns: ColumnDef<Bank>[] = useMemo(
+    () => [
       {
-      header: '#',
+        header: 'No',
         cell: (props) =>
           tableFilterState.pageSize * (tableFilterState.page - 1) +
           props.row.index +
@@ -130,12 +192,13 @@ const BanksTable = () => {
       {
         accessorKey: 'owner',
         header: 'Pemilik',
-      cell: (props) => (props.getValue() ? props.getValue() : '-'),
+        cell: (props) => props.getValue() || '-',
       },
       {
         header: 'Aksi',
-      cell: (props) => {
+        cell: (props: CellContext<Bank, unknown>) => {
-        const currentPageSize = props.table.getPaginationRowModel().rows.length;
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
           const currentPageRows = props.table.getPaginationRowModel().flatRows;
           const currentRowRelativeIndex =
             currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
@@ -148,137 +211,102 @@ const BanksTable = () => {
           };
 
           return (
-          <>
-            {currentPageSize > 2 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
             <RowOptionsMenu
-                  type='dropdown'
               props={props}
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
               deleteClickHandler={deleteClickHandler}
             />
-              </RowDropdownOptions>
-            )}
-
-            {currentPageSize <= 2 && (
-              <RowCollapseOptions>
-                <RowOptionsMenu
-                  type='collapse'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowCollapseOptions>
-            )}
-          </>
           );
         },
       },
-  ];
+    ],
-
+    [tableFilterState.pageSize, tableFilterState.page, deleteModal]
-  const confirmationModalDeleteClickHandler = async () => {
+  );
-    setIsDeleteLoading(true);
-
-    const deleteResponse = await BankApi.delete(selectedBank?.id as number);
-
-    if (isResponseError(deleteResponse)) {
-      toast.error(deleteResponse.message);
-      setIsDeleteLoading(false);
-      return;
-    }
-
-    refreshBanks();
-
-    deleteModal.closeModal();
-    toast.success('Successfully delete Bank!');
-    setIsDeleteLoading(false);
-  };
-
-  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value);
-  };
-
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
-    const newVal = val as OptionType;
-
-    setPageSize(newVal.value as number);
-  };
-
-  // track sorting
-  useEffect(() => {
-    const isNameSorted = sorting.find((sortItem) => sortItem.id === 'name');
-
-    if (!isNameSorted) {
-      updateFilter('nameSort', '');
-    } else {
-      updateFilter('nameSort', isNameSorted.desc ? 'desc' : 'asc');
-    }
-  }, [sorting]);
 
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row'>
+          {/* Action Buttons */}
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.master.banks.create'>
               <Button
                 href='/master-data/bank/add'
-                  variant='outline'
                 color='primary'
-                  className='w-full sm:w-fit'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-                  <Icon icon='ic:round-plus' width={24} height={24} />
+                <Icon icon='heroicons:plus' width={20} height={20} />
-                  Tambah
+                Add Bank
               </Button>
             </RequirePermission>
           </div>
 
+          {/* Search */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-              placeholder='Cari Bank'
+              placeholder='Search'
-              value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
                 />
-          </div>
+              }
-
+              className={{
-          <div className='flex flex-row justify-end'>
+                wrapper: 'w-full min-w-24 max-w-3xs',
-            <SelectInput
+                inputWrapper: 'rounded-xl! shadow-button-soft',
-              label='Baris'
+                input:
-              options={ROWS_OPTIONS}
+                  'placeholder:font-semibold placeholder:text-base-content/50',
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
               }}
-              onChange={pageSizeChangeHandler}
-              className={{ wrapper: 'max-w-28' }}
             />
           </div>
         </div>
 
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(banks) || banks.data?.length === 0 ? (
+            <div className='p-3'>
+              <BankTableSkeleton
+                columns={banksColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<Bank>
               data={isResponseSuccess(banks) ? banks?.data : []}
               columns={banksColumns}
               pageSize={tableFilterState.pageSize}
               page={isResponseSuccess(banks) ? banks?.meta?.page : 0}
-          totalItems={isResponseSuccess(banks) ? banks?.meta?.total_results : 0}
+              totalItems={
+                isResponseSuccess(banks) ? banks?.meta?.total_results : 0
+              }
               onPageChange={setPage}
+              onPageSizeChange={setPageSize}
               isLoading={isLoading}
               sorting={sorting}
               setSorting={setSorting}
               className={{
-            containerClassName: cn({
+                containerClassName: 'p-3 mb-0',
-              'mb-20': isResponseSuccess(banks) && banks?.data?.length === 0,
+                headerColumnClassName: 'text-nowrap',
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
+        </div>
       </div>
 
       <ConfirmationModal

src/components/pages/master-data/bank/skeleton/BankTableSkeleton.tsx

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

src/components/pages/master-data/customer/CustomersTable.tsx

@@ -1,46 +1,72 @@
 'use client';
 
-import Button from '@/components/Button';
+import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
+import useSWR from 'swr';
+import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
+import toast from 'react-hot-toast';
+
+import { Icon } from '@iconify/react';
+import Table from '@/components/Table';
 import DebouncedTextInput from '@/components/input/DebouncedTextInput';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
+import Button from '@/components/Button';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import Table from '@/components/Table';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RequirePermission from '@/components/helper/RequirePermission';
-import { ROWS_OPTIONS } from '@/config/constant';
+import PopoverButton from '@/components/popover/PopoverButton';
-import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import PopoverContent from '@/components/popover/PopoverContent';
-import { cn } from '@/lib/helper';
+import CustomerTableSkeleton from '@/components/pages/master-data/customer/skeleton/CustomerTableSkeleton';
-import { CustomerApi } from '@/services/api/master-data';
+
-import { useTableFilter } from '@/services/hooks/useTableFilter';
 import { Customer } from '@/types/api/master-data/customer';
-import { Icon } from '@iconify/react';
+import { CustomerApi } from '@/services/api/master-data';
-import { CellContext, ColumnDef } from '@tanstack/react-table';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { useState } from 'react';
+import { useTableFilter } from '@/services/hooks/useTableFilter';
-import toast from 'react-hot-toast';
+import { usePathname } from 'next/navigation';
-import useSWR from 'swr';
+import { useUiStore } from '@/stores/ui/ui.store';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Customer, unknown>;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `customer#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-customer#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.master.customer.detail'>
             <Button
               href={`/master-data/customer/detail/?customerId=${props.row.original.id}`}
               variant='ghost'
-          color='primary'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
@@ -48,34 +74,38 @@ const RowOptionsMenu = ({
             <Button
               href={`/master-data/customer/detail/edit/?customerId=${props.row.original.id}`}
               variant='ghost'
-          color='warning'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+              <Icon icon='heroicons:pencil-square' width={20} height={20} />
               Edit
             </Button>
           </RequirePermission>
           <RequirePermission permissions='lti.master.customer.delete'>
             <Button
-          onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
-          color='error'
+              color='none'
-          className='justify-start text-sm text-error focus-visible:text-error-content hover:text-error-content'
+              className='p-3 justify-start text-sm font-semibold w-full text-error hover:text-error'
             >
-          <Icon
+              <Icon icon='heroicons:trash' width={20} height={20} />
-            icon='material-symbols:delete-outline-rounded'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Delete
             </Button>
           </RequirePermission>
-    </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
 const CustomersTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -83,16 +113,17 @@ const CustomersTable = () => {
     setPageSize,
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
-    initial: { search: '', nameSort: '', picSort: '' },
+    initial: {
+      search: searchValue,
+    },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
-      nameSort: 'sort_name',
-      picSort: 'sort_pic',
     },
   });
 
-  // Fetch Data
+  const [sorting, setSorting] = useState<SortingState>([]);
+
   const {
     data: customers,
     isLoading,
@@ -102,87 +133,25 @@ const CustomersTable = () => {
     CustomerApi.getAllFetcher
   );
 
-  // State
   const deleteModal = useModal();
   const [selectedCustomer, setSelectedCustomer] = useState<
     Customer | undefined
   >(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
-  // Columns Definition
+  useEffect(() => {
-  const customersColumns: ColumnDef<Customer>[] = [
+    updateFilter('search', searchValue);
-    {
+  }, [searchValue, updateFilter]);
-      header: '#',
-      cell: (props) =>
-        tableFilterState.pageSize * (tableFilterState.page - 1) +
-        props.row.index +
-        1,
-    },
-    {
-      accessorKey: 'name',
-      header: 'Nama',
-    },
-    {
-      accessorKey: 'pic',
-      header: 'PIC',
-      cell: (props) => props.row.original.pic.name,
-    },
-    {
-      accessorKey: 'type',
-      header: 'Type',
-      cell: (props) => props.row.original.type,
-    },
-    {
-      accessorKey: 'phone',
-      header: 'Phone',
-    },
-    {
-      accessorKey: 'email',
-      header: 'Email',
-    },
-    {
-      header: 'Aksi',
-      cell: (props) => {
-        const currentPageSize = props.table.getPaginationRowModel().rows.length;
-        const currentPageRows = props.table.getPaginationRowModel().flatRows;
-        const currentRowRelativeIndex =
-          currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+  useEffect(() => {
+    setTableState('customers-table', pathname);
+  }, [pathname, setTableState]);
 
-        const deleteClickHandler = () => {
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-          setSelectedCustomer(props.row.original);
+    setSearchValue(e.target.value);
-          deleteModal.openModal();
+    updateFilter('search', e.target.value);
   };
 
-        return (
-          <>
-            {currentPageSize > 2 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                <RowOptionsMenu
-                  type='dropdown'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowDropdownOptions>
-            )}
-
-            {currentPageSize <= 2 && (
-              <RowCollapseOptions>
-                <RowOptionsMenu
-                  type='collapse'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowCollapseOptions>
-            )}
-          </>
-        );
-      },
-    },
-  ];
-
-  // Handler
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
@@ -202,81 +171,147 @@ const CustomersTable = () => {
     toast.success('Successfully delete Customer!');
     setIsDeleteLoading(false);
   };
-  const searchChangeHandler = (e: React.ChangeEvent<HTMLInputElement>) => {
+
-    updateFilter('search', e.target.value);
+  const customersColumns: ColumnDef<Customer>[] = useMemo(
-  };
+    () => [
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+      {
-    const newVal = val as OptionType;
+        header: 'No',
-    setPageSize(newVal.value as number);
+        cell: (props) =>
+          tableFilterState.pageSize * (tableFilterState.page - 1) +
+          props.row.index +
+          1,
+      },
+      {
+        accessorKey: 'name',
+        header: 'Nama',
+      },
+      {
+        accessorFn: (row) => row.pic?.name ?? '-',
+        header: 'PIC',
+      },
+      {
+        accessorKey: 'type',
+        header: 'Type',
+      },
+      {
+        accessorKey: 'phone',
+        header: 'Phone',
+      },
+      {
+        accessorKey: 'email',
+        header: 'Email',
+      },
+      {
+        header: 'Aksi',
+        cell: (props: CellContext<Customer, unknown>) => {
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
+          const currentPageRows = props.table.getPaginationRowModel().flatRows;
+          const currentRowRelativeIndex =
+            currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
+
+          const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+
+          const deleteClickHandler = () => {
+            setSelectedCustomer(props.row.original);
+            deleteModal.openModal();
           };
 
+          return (
+            <RowOptionsMenu
+              props={props}
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
+              deleteClickHandler={deleteClickHandler}
+            />
+          );
+        },
+      },
+    ],
+    [tableFilterState.pageSize, tableFilterState.page, deleteModal]
+  );
+
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row'>
+          {/* Action Buttons */}
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.master.customer.create'>
               <Button
                 href='/master-data/customer/add'
-                  variant='outline'
                 color='primary'
-                  className='w-full sm:w-fit'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-                  <Icon icon='ic:round-plus' width={24} height={24} />
+                <Icon icon='heroicons:plus' width={20} height={20} />
-                  Tambah
+                Add Customer
               </Button>
             </RequirePermission>
           </div>
 
+          {/* Search */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-              placeholder='Cari Kandang'
+              placeholder='Search'
-              value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
                 />
-          </div>
+              }
-
+              className={{
-          <div className='flex flex-row justify-end'>
+                wrapper: 'w-full min-w-24 max-w-3xs',
-            <SelectInput
+                inputWrapper: 'rounded-xl! shadow-button-soft',
-              label='Baris'
+                input:
-              options={ROWS_OPTIONS}
+                  'placeholder:font-semibold placeholder:text-base-content/50',
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
               }}
-              onChange={pageSizeChangeHandler}
-              className={{ wrapper: 'max-w-28' }}
             />
           </div>
         </div>
 
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(customers) || customers.data?.length === 0 ? (
+            <div className='p-3'>
+              <CustomerTableSkeleton
+                columns={customersColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<Customer>
-          data={isResponseSuccess(customers) ? customers?.data : []}
+              data={customers?.data}
               columns={customersColumns}
               pageSize={tableFilterState.pageSize}
-          page={isResponseSuccess(customers) ? customers?.meta?.page : 0}
+              page={customers?.meta?.page ?? 0}
-          totalItems={
+              totalItems={customers?.meta?.total_results ?? 0}
-            isResponseSuccess(customers) ? customers?.meta?.total_results : 0
-          }
               onPageChange={setPage}
-          isLoading={isLoading}
+              onPageSizeChange={setPageSize}
+              isLoading={false}
+              sorting={sorting}
+              setSorting={setSorting}
               className={{
-            containerClassName: cn({
+                containerClassName: 'p-3 mb-0',
-              'mb-20':
+                headerColumnClassName: 'text-nowrap',
-                isResponseSuccess(customers) && customers?.data?.length === 0,
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
+        </div>
       </div>
 
       <ConfirmationModal

src/components/pages/master-data/customer/skeleton/CustomerTableSkeleton.tsx

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

src/components/pages/master-data/flock/FlocksTable.tsx

@@ -1,51 +1,72 @@
 'use client';
 
-import { CellContext, ColumnDef } from '@tanstack/react-table';
+import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
-import { Flock } from '@/types/api/master-data/flock';
-import { cn } from '@/lib/helper';
-import Button from '@/components/Button';
-import { Icon } from '@iconify/react';
-import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { useState } from 'react';
 import useSWR from 'swr';
-import { FlockApi } from '@/services/api/master-data';
+import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
-import { useModal } from '@/components/Modal';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
-import RequirePermission from '@/components/helper/RequirePermission';
 import toast from 'react-hot-toast';
-import DebouncedTextInput from '@/components/input/DebouncedTextInput';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
-import { ROWS_OPTIONS } from '@/config/constant';
-import Table from '@/components/Table';
-import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import ConfirmationModal from '@/components/modal/ConfirmationModal';
 
-const RowsOptions = ({
+import { Icon } from '@iconify/react';
-  type = 'dropdown',
+import Table from '@/components/Table';
+import DebouncedTextInput from '@/components/input/DebouncedTextInput';
+import Button from '@/components/Button';
+import { useModal } from '@/components/Modal';
+import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import RequirePermission from '@/components/helper/RequirePermission';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
+import FlockTableSkeleton from '@/components/pages/master-data/flock/skeleton/FlockTableSkeleton';
+
+import { Flock } from '@/types/api/master-data/flock';
+import { FlockApi } from '@/services/api/master-data';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { useTableFilter } from '@/services/hooks/useTableFilter';
+import { usePathname } from 'next/navigation';
+import { useUiStore } from '@/stores/ui/ui.store';
+
+const RowOptionsMenu = ({
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Flock, unknown>;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `flock#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-flock#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.master.flocks.detail'>
             <Button
               href={`/master-data/flock/detail/?flockId=${props.row.original.id}`}
               variant='ghost'
-          color='primary'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon
+              <Icon icon='heroicons:eye' width={20} height={20} />
-            icon='mdi:eye-outline'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Detail
             </Button>
           </RequirePermission>
@@ -53,39 +74,38 @@ const RowsOptions = ({
             <Button
               href={`/master-data/flock/detail/edit/?flockId=${props.row.original.id}`}
               variant='ghost'
-          color='warning'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon
+              <Icon icon='heroicons:pencil-square' width={20} height={20} />
-            icon='material-symbols:edit-outline'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Edit
             </Button>
           </RequirePermission>
           <RequirePermission permissions='lti.master.flocks.delete'>
             <Button
-          onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
-          color='error'
+              color='none'
-          className='justify-start text-sm text-error focus-visible:text-error-content hover:text-error-content'
+              className='p-3 justify-start text-sm font-semibold w-full text-error hover:text-error'
             >
-          <Icon
+              <Icon icon='heroicons:trash' width={20} height={20} />
-            icon='material-symbols:delete-outline-rounded'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Delete
             </Button>
           </RequirePermission>
-    </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
 const FlockTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -93,15 +113,17 @@ const FlockTable = () => {
     setPageSize,
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
-    initial: { search: '', nameSort: '' },
+    initial: {
+      search: searchValue,
+    },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
-      nameSort: 'sort_name',
     },
   });
 
-  // Fetch Data
+  const [sorting, setSorting] = useState<SortingState>([]);
+
   const {
     data: flocks,
     isLoading,
@@ -111,74 +133,25 @@ const FlockTable = () => {
     FlockApi.getAllFetcher
   );
 
-  // State
   const deleteModal = useModal();
   const [selectedFlock, setSelectedFlock] = useState<Flock | undefined>(
     undefined
   );
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
-  // Columns Definition
+  useEffect(() => {
-  const flocksColumns: ColumnDef<Flock>[] = [
+    updateFilter('search', searchValue);
-    {
+  }, [searchValue, updateFilter]);
-      header: '#',
-      cell: (props) =>
-        tableFilterState.pageSize * (tableFilterState.page - 1) +
-        props.row.index +
-        1,
-    },
-    {
-      accessorKey: 'name',
-      header: 'Nama',
-    },
-    {
-      accessorKey: 'created_at',
-      header: 'Dibuat pada',
-      cell: (props) =>
-        new Date(props.row.original.created_at).toLocaleDateString(),
-    },
-    {
-      header: 'Aksi',
-      cell: (props) => {
-        const currentPageSize = props.table.getPaginationRowModel().rows.length;
-        const currentPageRows = props.table.getPaginationRowModel().flatRows;
-        const currentRowRelativeIndex =
-          currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+  useEffect(() => {
+    setTableState('flocks-table', pathname);
+  }, [pathname, setTableState]);
 
-        const deleteClickHandler = () => {
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-          setSelectedFlock(props.row.original);
+    setSearchValue(e.target.value);
-          deleteModal.openModal();
+    updateFilter('search', e.target.value);
   };
 
-        return (
-          <>
-            {currentPageSize > 2 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                <RowsOptions
-                  type='dropdown'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowDropdownOptions>
-            )}
-            {currentPageSize <= 2 && (
-              <RowCollapseOptions>
-                <RowsOptions
-                  type='collapse'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowCollapseOptions>
-            )}
-          </>
-        );
-      },
-    },
-  ];
-
-  // Handler
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
@@ -196,85 +169,143 @@ const FlockTable = () => {
     toast.success('Successfully delete Flock!');
     setIsDeleteLoading(false);
   };
-  const searchChangeHandler = (e: React.ChangeEvent<HTMLInputElement>) => {
+
-    updateFilter('search', e.target.value);
+  const flocksColumns: ColumnDef<Flock>[] = useMemo(
-  };
+    () => [
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+      {
-    const newVal = val as OptionType;
+        header: 'No',
-    setPageSize(newVal.value as number);
+        cell: (props) =>
+          tableFilterState.pageSize * (tableFilterState.page - 1) +
+          props.row.index +
+          1,
+      },
+      {
+        accessorKey: 'name',
+        header: 'Nama',
+      },
+      {
+        accessorKey: 'created_at',
+        header: 'Dibuat pada',
+        cell: (props) =>
+          new Date(props.row.original.created_at).toLocaleDateString('id-ID'),
+      },
+      {
+        header: 'Aksi',
+        cell: (props: CellContext<Flock, unknown>) => {
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
+          const currentPageRows = props.table.getPaginationRowModel().flatRows;
+          const currentRowRelativeIndex =
+            currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
+
+          const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+
+          const deleteClickHandler = () => {
+            setSelectedFlock(props.row.original);
+            deleteModal.openModal();
           };
 
+          return (
+            <RowOptionsMenu
+              props={props}
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
+              deleteClickHandler={deleteClickHandler}
+            />
+          );
+        },
+      },
+    ],
+    [tableFilterState.pageSize, tableFilterState.page, deleteModal]
+  );
+
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row'>
+          {/* Action Buttons */}
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.master.flocks.create'>
               <Button
                 href='/master-data/flock/add'
-                  variant='outline'
                 color='primary'
-                  className='w-full sm:w-fit'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-                  <Icon icon='ic:round-plus' width={24} height={24} />
+                <Icon icon='heroicons:plus' width={20} height={20} />
-                  Tambah
+                Add Flock
               </Button>
             </RequirePermission>
           </div>
 
+          {/* Search */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-              placeholder='Cari Flock'
+              placeholder='Search'
-              value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
                 />
-          </div>
+              }
-
+              className={{
-          <div className='flex flex-row justify-end'>
+                wrapper: 'w-full min-w-24 max-w-3xs',
-            <SelectInput
+                inputWrapper: 'rounded-xl! shadow-button-soft',
-              label='Baris'
+                input:
-              options={ROWS_OPTIONS}
+                  'placeholder:font-semibold placeholder:text-base-content/50',
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
               }}
-              onChange={pageSizeChangeHandler}
-              className={{ wrapper: 'max-w-28' }}
             />
           </div>
         </div>
 
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(flocks) || flocks.data?.length === 0 ? (
+            <div className='p-3'>
+              <FlockTableSkeleton
+                columns={flocksColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<Flock>
-          data={isResponseSuccess(flocks) ? flocks?.data : []}
+              data={flocks?.data}
               columns={flocksColumns}
               pageSize={tableFilterState.pageSize}
-          page={isResponseSuccess(flocks) ? flocks?.meta?.page : 0}
+              page={flocks?.meta?.page ?? 0}
-          totalItems={
+              totalItems={flocks?.meta?.total_results ?? 0}
-            isResponseSuccess(flocks) ? flocks?.meta?.total_results : 0
-          }
               onPageChange={setPage}
-          isLoading={isLoading}
+              onPageSizeChange={setPageSize}
+              isLoading={false}
+              sorting={sorting}
+              setSorting={setSorting}
               className={{
-            containerClassName: cn({
+                containerClassName: 'p-3 mb-0',
-              'mb-20': isResponseSuccess(flocks) && flocks?.data?.length === 0,
+                headerColumnClassName: 'text-nowrap',
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
         </div>
+      </div>
+
       <ConfirmationModal
         ref={deleteModal.ref}
         type='error'
-        text={`Apakah anda yakin ingin menghapus data Supplier ini (${selectedFlock?.name})?`}
+        text={`Apakah anda yakin ingin menghapus data Flock ini (${selectedFlock?.name})?`}
         secondaryButton={{
           text: 'Tidak',
         }}

src/components/pages/master-data/flock/skeleton/FlockTableSkeleton.tsx

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

src/components/pages/master-data/kandang/KandangsTable.tsx

@@ -1,90 +1,130 @@
 'use client';
 
-import { ChangeEventHandler, useCallback, useEffect, useState } from 'react';
-import useSWR from 'swr';
 import {
-  CellContext,
+  ChangeEventHandler,
-  ColumnDef,
+  useCallback,
-  ColumnSort,
+  useEffect,
-  SortingState,
+  useMemo,
-} from '@tanstack/react-table';
+  useState,
+} from 'react';
+import { usePathname } from 'next/navigation';
+import useSWR from 'swr';
+import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 import toast from 'react-hot-toast';
+import { useFormik } from 'formik';
 
 import { Icon } from '@iconify/react';
 import Table from '@/components/Table';
 import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import Button from '@/components/Button';
-import { useModal } from '@/components/Modal';
+import Modal, { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RequirePermission from '@/components/helper/RequirePermission';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
+import KandangTableSkeleton from '@/components/pages/master-data/kandang/skeleton/KandangTableSkeleton';
+import SelectInput, { useSelect } from '@/components/input/SelectInput';
+import { OptionType } from '@/components/input/SelectInput';
+import ButtonFilter from '@/components/helper/ButtonFilter';
 
 import { Kandang } from '@/types/api/master-data/kandang';
-import { KandangApi } from '@/services/api/master-data';
+import { Location } from '@/types/api/master-data/location';
-import { cn, formatNumber } from '@/lib/helper';
+import { KandangApi, LocationApi } from '@/services/api/master-data';
+import { UserApi } from '@/services/api/user';
+import { User } from '@/types/api/api-general';
+import { formatNumber } from '@/lib/helper';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { ROWS_OPTIONS } from '@/config/constant';
+import { useUiStore } from '@/stores/ui/ui.store';
+import {
+  KandangFilterSchema,
+  KandangFilterType,
+} from '@/components/pages/master-data/kandang/filter/KandangFilter';
+import SelectInputRadio from '@/components/input/SelectInputRadio';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Kandang, unknown>;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `kandang#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-kandang#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.master.kandangs.detail'>
             <Button
               href={`/master-data/kandang/detail/?kandangId=${props.row.original.id}`}
               variant='ghost'
-          color='primary'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.kandangs.update'>
             <Button
               href={`/master-data/kandang/detail/edit/?kandangId=${props.row.original.id}`}
               variant='ghost'
-          color='warning'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+              <Icon icon='heroicons:pencil-square' width={20} height={20} />
               Edit
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.kandangs.delete'>
             <Button
-          onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
-          color='error'
+              color='none'
-          className='justify-start text-sm text-error focus-visible:text-error-content hover:text-error-content'
+              className='p-3 justify-start text-sm font-semibold w-full text-error hover:text-error'
             >
-          <Icon
+              <Icon icon='heroicons:trash' width={20} height={20} />
-            icon='material-symbols:delete-outline-rounded'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Delete
             </Button>
           </RequirePermission>
-    </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
 const KandangsTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -94,21 +134,112 @@ const KandangsTable = () => {
   } = useTableFilter({
     initial: {
       search: '',
-      nameSort: '',
+      locationFilter: '',
-      locationSort: '',
+      picFilter: '',
-      capacitySort: '',
-      picSort: '',
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
-      nameSort: 'sort_name',
+      locationFilter: 'location_id',
-      locationSort: 'sort_location',
+      picFilter: 'pic_id',
-      capacitySort: 'sort_capacity',
-      picSort: ' sort_pic',
     },
   });
 
+  // ===== FILTER MODAL STATE =====
+  const filterModal = useModal();
+
+  // ===== FORMIK SETUP =====
+  const formik = useFormik<KandangFilterType>({
+    initialValues: {
+      location_id: null,
+      pic_id: null,
+    },
+    validationSchema: KandangFilterSchema,
+    onSubmit: (values, { setSubmitting }) => {
+      updateFilter('locationFilter', values.location_id || '');
+      updateFilter('picFilter', values.pic_id || '');
+      filterModal.closeModal();
+      setSubmitting(false);
+    },
+    onReset: () => {
+      updateFilter('locationFilter', '');
+      updateFilter('picFilter', '');
+    },
+  });
+
+  // ===== LOCATION OPTIONS =====
+  const {
+    setInputValue: setLocationInputValue,
+    options: locationOptions,
+    isLoadingOptions: isLoadingLocationOptions,
+    loadMore: loadMoreLocations,
+  } = useSelect<Location>(
+    filterModal.open ? LocationApi.basePath : null,
+    'id',
+    'name',
+    'search'
+  );
+
+  // ===== PIC OPTIONS =====
+  const {
+    setInputValue: setPicInputValue,
+    options: picOptions,
+    isLoadingOptions: isLoadingPicOptions,
+    loadMore: loadMorePics,
+  } = useSelect<User>(
+    filterModal.open ? UserApi.basePath : null,
+    'id',
+    'name',
+    'search'
+  );
+
+  // ===== FILTER HANDLERS =====
+  const handleFilterLocationChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const location = val as OptionType | null;
+      const locationId = location?.value ? String(location.value) : null;
+
+      formik.setFieldValue('location_id', locationId);
+    },
+    [formik]
+  );
+
+  const handleFilterPicChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const pic = val as OptionType | null;
+      const picId = pic?.value ? String(pic.value) : null;
+
+      formik.setFieldValue('pic_id', picId);
+    },
+    [formik]
+  );
+
+  // ===== FILTER HELPERS =====
+  const locationIdValue = useMemo(() => {
+    if (!formik.values.location_id) return null;
+    return (
+      locationOptions.find(
+        (opt) => String(opt.value) === formik.values.location_id
+      ) || null
+    );
+  }, [formik.values.location_id, locationOptions]);
+
+  const picIdValue = useMemo(() => {
+    if (!formik.values.pic_id) return null;
+    return (
+      picOptions.find((opt) => String(opt.value) === formik.values.pic_id) ||
+      null
+    );
+  }, [formik.values.pic_id, picOptions]);
+
+  // ===== HANDLE FILTER MODAL OPEN =====
+  const handleFilterModalOpen = () => {
+    filterModal.openModal();
+    formik.validateForm();
+  };
+
+  const [sorting, setSorting] = useState<SortingState>([]);
+
   const {
     data: kandangs,
     isLoading,
@@ -119,83 +250,24 @@ const KandangsTable = () => {
   );
 
   const deleteModal = useModal();
-
   const [selectedKandang, setSelectedKandang] = useState<Kandang | undefined>(
     undefined
   );
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
-  const [sorting, setSorting] = useState<SortingState>([]);
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
 
-  const kandangsColumns: ColumnDef<Kandang>[] = [
+  useEffect(() => {
-    {
+    setTableState('kandangs-table', pathname);
-      header: '#',
+  }, [pathname, setTableState]);
-      cell: (props) =>
-        tableFilterState.pageSize * (tableFilterState.page - 1) +
-        props.row.index +
-        1,
-    },
-    {
-      accessorKey: 'name',
-      header: 'Nama',
-    },
-    {
-      accessorKey: 'location',
-      header: 'Lokasi',
-      cell: (props) => props.row.original.location.name,
-    },
-    {
-      accessorKey: 'capacity',
-      header: 'Kapasitas',
-      cell: (props) => formatNumber(props.row.original.capacity ?? 0),
-    },
-    {
-      accessorKey: 'pic',
-      header: 'PIC',
-      cell: (props) => props.row.original.pic.name,
-    },
-    {
-      header: 'Aksi',
-      cell: (props) => {
-        const currentPageSize = props.table.getPaginationRowModel().rows.length;
-        const currentPageRows = props.table.getPaginationRowModel().flatRows;
-        const currentRowRelativeIndex =
-          currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-
+    setSearchValue(e.target.value);
-        const deleteClickHandler = () => {
+    updateFilter('search', e.target.value);
-          setSelectedKandang(props.row.original);
-          deleteModal.openModal();
   };
 
-        return (
-          <>
-            {currentPageSize > 2 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                <RowOptionsMenu
-                  type='dropdown'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowDropdownOptions>
-            )}
-
-            {currentPageSize <= 2 && (
-              <RowCollapseOptions>
-                <RowOptionsMenu
-                  type='collapse'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowCollapseOptions>
-            )}
-          </>
-        );
-      },
-    },
-  ];
-
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
@@ -216,114 +288,150 @@ const KandangsTable = () => {
     setIsDeleteLoading(false);
   };
 
-  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+  const kandangsColumns: ColumnDef<Kandang>[] = useMemo(
-    updateFilter('search', e.target.value);
+    () => [
-  };
+      {
-
+        header: 'No',
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+        cell: (props) =>
-    const newVal = val as OptionType;
+          tableFilterState.pageSize * (tableFilterState.page - 1) +
-
+          props.row.index +
-    setPageSize(newVal.value as number);
+          1,
-  };
-
-  const updateSortingFilter = useCallback(
-    (
-      sortName: Exclude<keyof typeof tableFilterState, 'page' | 'pageSize'>,
-      sortFilter: ColumnSort | undefined
-    ) => {
-      if (!sortFilter) {
-        updateFilter(sortName, '');
-      } else {
-        updateFilter(sortName, sortFilter.desc ? 'desc' : 'asc');
-      }
       },
-    [updateFilter]
+      {
-  );
+        accessorKey: 'name',
+        header: 'Nama',
+      },
+      {
+        accessorFn: (row) => row.location?.name ?? '-',
+        header: 'Lokasi',
+      },
+      {
+        accessorKey: 'capacity',
+        header: 'Kapasitas',
+        cell: (props) => formatNumber(props.row.original.capacity ?? 0),
+      },
+      {
+        accessorFn: (row) => row.pic?.name ?? '-',
+        header: 'PIC',
+      },
+      {
+        header: 'Aksi',
+        cell: (props: CellContext<Kandang, unknown>) => {
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
+          const currentPageRows = props.table.getPaginationRowModel().flatRows;
+          const currentRowRelativeIndex =
+            currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-  // track sorting
+          const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-  useEffect(() => {
-    const nameSortFilter = sorting.find((sortItem) => sortItem.id === 'name');
-    const locationSortFilter = sorting.find(
-      (sortItem) => sortItem.id === 'location'
-    );
-    const picSortFilter = sorting.find((sortItem) => sortItem.id === 'pic');
 
-    updateSortingFilter('nameSort', nameSortFilter);
+          const deleteClickHandler = () => {
-    updateSortingFilter('locationSort', locationSortFilter);
+            setSelectedKandang(props.row.original);
-    updateSortingFilter('picSort', picSortFilter);
+            deleteModal.openModal();
-  }, [sorting, updateSortingFilter]);
+          };
+
+          return (
+            <RowOptionsMenu
+              props={props}
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
+              deleteClickHandler={deleteClickHandler}
+            />
+          );
+        },
+      },
+    ],
+    [tableFilterState.pageSize, tableFilterState.page, deleteModal]
+  );
 
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row'>
+          {/* Action Buttons */}
-              <div className='w-full flex flex-row'>
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.master.kandangs.create'>
               <Button
                 href='/master-data/kandang/add'
-                    variant='outline'
                 color='primary'
-                    className='w-full sm:w-fit'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-                    <Icon icon='ic:round-plus' width={24} height={24} />
+                <Icon icon='heroicons:plus' width={20} height={20} />
-                    Tambah
+                Add Kandang
               </Button>
             </RequirePermission>
           </div>
-            </div>
 
+          {/* Search and Filter */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-              placeholder='Cari Kandang'
+              placeholder='Search'
-              value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
                 />
-          </div>
+              }
-
+              className={{
-          <div className='flex flex-row justify-end'>
+                wrapper: 'w-full min-w-24 max-w-3xs',
-            <SelectInput
+                inputWrapper: 'rounded-xl! shadow-button-soft',
-              label='Baris'
+                input:
-              options={ROWS_OPTIONS}
+                  'placeholder:font-semibold placeholder:text-base-content/50',
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
               }}
-              onChange={pageSizeChangeHandler}
+            />
-              className={{ wrapper: 'max-w-28' }}
+
+            <ButtonFilter
+              values={tableFilterState}
+              excludeFields={['page', 'pageSize', 'search']}
+              onClick={handleFilterModalOpen}
+              className='px-3 py-2.5'
             />
           </div>
         </div>
 
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(kandangs) || kandangs.data?.length === 0 ? (
+            <div className='p-3'>
+              <KandangTableSkeleton
+                columns={kandangsColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<Kandang>
-          data={isResponseSuccess(kandangs) ? kandangs?.data : []}
+              data={kandangs?.data}
               columns={kandangsColumns}
               pageSize={tableFilterState.pageSize}
-          page={isResponseSuccess(kandangs) ? kandangs?.meta?.page : 0}
+              page={kandangs?.meta?.page ?? 0}
-          totalItems={
+              totalItems={kandangs?.meta?.total_results ?? 0}
-            isResponseSuccess(kandangs) ? kandangs?.meta?.total_results : 0
-          }
               onPageChange={setPage}
-          isLoading={isLoading}
+              onPageSizeChange={setPageSize}
+              isLoading={false}
               sorting={sorting}
               setSorting={setSorting}
               className={{
-            containerClassName: cn({
+                containerClassName: 'p-3 mb-0',
-              'mb-20':
+                headerColumnClassName: 'text-nowrap',
-                isResponseSuccess(kandangs) && kandangs?.data?.length === 0,
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
+        </div>
       </div>
 
       <ConfirmationModal
@@ -340,6 +448,81 @@ const KandangsTable = () => {
           onClick: confirmationModalDeleteClickHandler,
         }}
       />
+
+      {/* Filter Modal */}
+      <Modal
+        ref={filterModal.ref}
+        className={{
+          modal: 'p-0',
+          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
+        }}
+      >
+        {/* Modal Header */}
+        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
+          <div className='flex items-center gap-2 text-primary'>
+            <Icon icon='heroicons:funnel' width={20} height={20} />
+            <h3 className='font-medium text-sm'>Filter Data</h3>
+          </div>
+          <Button
+            variant='link'
+            onClick={filterModal.closeModal}
+            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
+          >
+            <Icon icon='heroicons:x-mark' width={20} height={20} />
+          </Button>
+        </div>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
+          <div className='p-4 flex flex-col gap-1.5'>
+            <SelectInput
+              label='Lokasi'
+              placeholder='Pilih Lokasi'
+              options={locationOptions}
+              value={locationIdValue}
+              onChange={handleFilterLocationChange}
+              onInputChange={setLocationInputValue}
+              isLoading={isLoadingLocationOptions}
+              isClearable
+              onMenuScrollToBottom={loadMoreLocations}
+              className={{ wrapper: 'w-full' }}
+            />
+
+            <SelectInputRadio
+              label='PIC'
+              placeholder='Pilih PIC'
+              options={picOptions}
+              value={picIdValue}
+              onChange={handleFilterPicChange}
+              onInputChange={setPicInputValue}
+              isLoading={isLoadingPicOptions}
+              isClearable
+              onMenuScrollToBottom={loadMorePics}
+              className={{ wrapper: 'w-full' }}
+            />
+          </div>
+
+          {/* Modal Footer */}
+          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
+            <Button
+              type='button'
+              variant='soft'
+              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
+              onClick={() => {
+                formik.resetForm();
+                filterModal.closeModal();
+              }}
+            >
+              Reset Filter
+            </Button>
+            <Button
+              type='submit'
+              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
+              disabled={!formik.isValid || formik.isSubmitting}
+            >
+              Apply Filter
+            </Button>
+          </div>
+        </form>
+      </Modal>
     </>
   );
 };

src/components/pages/master-data/kandang/filter/KandangFilter.ts

@@ -0,0 +1,11 @@
+import { string, object } from 'yup';
+
+export const KandangFilterSchema = object().shape({
+  location_id: string().nullable(),
+  pic_id: string().nullable(),
+});
+
+export type KandangFilterType = {
+  location_id: string | null;
+  pic_id: string | null;
+};

src/components/pages/master-data/kandang/skeleton/KandangTableSkeleton.tsx

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

src/components/pages/master-data/location/LocationsTable.tsx

@@ -1,90 +1,126 @@
 'use client';
 
-import { ChangeEventHandler, useCallback, useEffect, useState } from 'react';
-import useSWR from 'swr';
 import {
-  CellContext,
+  ChangeEventHandler,
-  ColumnDef,
+  useCallback,
-  ColumnSort,
+  useEffect,
-  SortingState,
+  useMemo,
-} from '@tanstack/react-table';
+  useState,
+} from 'react';
+import { usePathname } from 'next/navigation';
+import useSWR from 'swr';
+import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 import toast from 'react-hot-toast';
+import { useFormik } from 'formik';
 
 import { Icon } from '@iconify/react';
 import Table from '@/components/Table';
 import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import Button from '@/components/Button';
-import { useModal } from '@/components/Modal';
+import Modal, { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RequirePermission from '@/components/helper/RequirePermission';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
+import LocationTableSkeleton from '@/components/pages/master-data/location/skeleton/LocationTableSkeleton';
+import SelectInput, { useSelect } from '@/components/input/SelectInput';
+import { OptionType } from '@/components/input/SelectInput';
+import ButtonFilter from '@/components/helper/ButtonFilter';
 
 import { Location } from '@/types/api/master-data/location';
-import { LocationApi } from '@/services/api/master-data';
+import { Area } from '@/types/api/master-data/area';
-import { cn } from '@/lib/helper';
+import { LocationApi, AreaApi } from '@/services/api/master-data';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { ROWS_OPTIONS } from '@/config/constant';
+import { useUiStore } from '@/stores/ui/ui.store';
+import {
+  LocationFilterSchema,
+  LocationFilterType,
+} from '@/components/pages/master-data/location/filter/LocationFilter';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Location, unknown>;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `location#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-location#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.master.locations.detail'>
             <Button
               href={`/master-data/location/detail/?locationId=${props.row.original.id}`}
               variant='ghost'
-          color='primary'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.locations.update'>
             <Button
               href={`/master-data/location/detail/edit/?locationId=${props.row.original.id}`}
               variant='ghost'
-          color='warning'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+              <Icon icon='heroicons:pencil-square' width={20} height={20} />
               Edit
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.locations.delete'>
             <Button
-          onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
-          color='error'
+              color='none'
-          className='justify-start text-sm text-error focus-visible:text-error-content hover:text-error-content'
+              className='p-3 justify-start text-sm font-semibold w-full text-error hover:text-error'
             >
-          <Icon
+              <Icon icon='heroicons:trash' width={20} height={20} />
-            icon='material-symbols:delete-outline-rounded'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Delete
             </Button>
           </RequirePermission>
-    </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
 const LocationsTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -92,16 +128,75 @@ const LocationsTable = () => {
     setPageSize,
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
-    initial: { search: '', nameSort: '', addressSort: '', areaSort: '' },
+    initial: {
+      search: '',
+      areaFilter: '',
+    },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
-      nameSort: 'sort_name',
+      areaFilter: 'area_id',
-      addressSort: 'sort_address',
-      areaSort: ' sort_area',
     },
   });
 
+  // ===== FILTER MODAL STATE =====
+  const filterModal = useModal();
+
+  // ===== FORMIK SETUP =====
+  const formik = useFormik<LocationFilterType>({
+    initialValues: {
+      area_id: null,
+    },
+    validationSchema: LocationFilterSchema,
+    onSubmit: (values, { setSubmitting }) => {
+      updateFilter('areaFilter', values.area_id || '');
+      filterModal.closeModal();
+      setSubmitting(false);
+    },
+    onReset: () => {
+      updateFilter('areaFilter', '');
+    },
+  });
+
+  // ===== AREA OPTIONS =====
+  const {
+    setInputValue: setAreaInputValue,
+    options: areaOptions,
+    isLoadingOptions: isLoadingAreaOptions,
+    loadMore: loadMoreAreas,
+  } = useSelect<Area>(
+    filterModal.open ? AreaApi.basePath : null,
+    'id',
+    'name',
+    'search'
+  );
+
+  // ===== FILTER HANDLERS =====
+  const handleFilterAreaChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const area = val as OptionType | null;
+      const areaId = area?.value ? String(area.value) : null;
+
+      formik.setFieldValue('area_id', areaId);
+    },
+    [formik]
+  );
+
+  // ===== FILTER HELPERS =====
+  const areaIdValue = useMemo(() => {
+    if (!formik.values.area_id) return null;
+    return (
+      areaOptions.find((opt) => String(opt.value) === formik.values.area_id) ||
+      null
+    );
+  }, [formik.values.area_id, areaOptions]);
+
+  // ===== HANDLE FILTER MODAL OPEN =====
+  const handleFilterModalOpen = () => {
+    filterModal.openModal();
+    formik.validateForm();
+  };
+
   const {
     data: locations,
     isLoading,
@@ -112,77 +207,26 @@ const LocationsTable = () => {
   );
 
   const deleteModal = useModal();
-
   const [selectedLocation, setSelectedLocation] = useState<
     Location | undefined
   >(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('locations-table', pathname);
+  }, [pathname, setTableState]);
+
   const [sorting, setSorting] = useState<SortingState>([]);
 
-  const locationsColumns: ColumnDef<Location>[] = [
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    {
+    setSearchValue(e.target.value);
-      header: '#',
+    updateFilter('search', e.target.value);
-      cell: (props) =>
-        tableFilterState.pageSize * (tableFilterState.page - 1) +
-        props.row.index +
-        1,
-    },
-    {
-      accessorKey: 'name',
-      header: 'Nama',
-    },
-    {
-      accessorKey: 'address',
-      header: 'Alamat',
-    },
-    {
-      accessorKey: 'area',
-      header: 'Area',
-      cell: (props) => props.row.original.area.name,
-    },
-    {
-      header: 'Aksi',
-      cell: (props) => {
-        const currentPageSize = props.table.getPaginationRowModel().rows.length;
-        const currentPageRows = props.table.getPaginationRowModel().flatRows;
-        const currentRowRelativeIndex =
-          currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
-
-        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-
-        const deleteClickHandler = () => {
-          setSelectedLocation(props.row.original);
-          deleteModal.openModal();
   };
 
-        return (
-          <>
-            {currentPageSize > 2 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                <RowOptionsMenu
-                  type='dropdown'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowDropdownOptions>
-            )}
-
-            {currentPageSize <= 2 && (
-              <RowCollapseOptions>
-                <RowOptionsMenu
-                  type='collapse'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowCollapseOptions>
-            )}
-          </>
-        );
-      },
-    },
-  ];
-
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
@@ -203,114 +247,145 @@ const LocationsTable = () => {
     setIsDeleteLoading(false);
   };
 
-  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+  const locationsColumns: ColumnDef<Location>[] = useMemo(
-    updateFilter('search', e.target.value);
+    () => [
-  };
+      {
-
+        header: 'No',
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+        cell: (props) =>
-    const newVal = val as OptionType;
+          tableFilterState.pageSize * (tableFilterState.page - 1) +
-
+          props.row.index +
-    setPageSize(newVal.value as number);
+          1,
-  };
-
-  const updateSortingFilter = useCallback(
-    (
-      sortName: Exclude<keyof typeof tableFilterState, 'page' | 'pageSize'>,
-      sortFilter: ColumnSort | undefined
-    ) => {
-      if (!sortFilter) {
-        updateFilter(sortName, '');
-      } else {
-        updateFilter(sortName, sortFilter.desc ? 'desc' : 'asc');
-      }
       },
-    [updateFilter]
+      {
-  );
+        accessorKey: 'name',
+        header: 'Nama',
+      },
+      {
+        accessorKey: 'address',
+        header: 'Alamat',
+      },
+      {
+        accessorFn: (row) => row.area?.name ?? '-',
+        header: 'Area',
+      },
+      {
+        header: 'Aksi',
+        cell: (props: CellContext<Location, unknown>) => {
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
+          const currentPageRows = props.table.getPaginationRowModel().flatRows;
+          const currentRowRelativeIndex =
+            currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-  // track sorting
+          const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-  useEffect(() => {
-    const nameSortFilter = sorting.find((sortItem) => sortItem.id === 'name');
-    const addressSortFilter = sorting.find(
-      (sortItem) => sortItem.id === 'address'
-    );
-    const areaSortFilter = sorting.find((sortItem) => sortItem.id === 'area');
 
-    updateSortingFilter('nameSort', nameSortFilter);
+          const deleteClickHandler = () => {
-    updateSortingFilter('addressSort', addressSortFilter);
+            setSelectedLocation(props.row.original);
-    updateSortingFilter('areaSort', areaSortFilter);
+            deleteModal.openModal();
-  }, [sorting, updateSortingFilter]);
+          };
+
+          return (
+            <RowOptionsMenu
+              props={props}
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
+              deleteClickHandler={deleteClickHandler}
+            />
+          );
+        },
+      },
+    ],
+    [tableFilterState.pageSize, tableFilterState.page, deleteModal]
+  );
 
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row'>
+          {/* Action Buttons */}
-              <div className='w-full flex flex-row'>
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.master.locations.create'>
               <Button
                 href='/master-data/location/add'
-                    variant='outline'
                 color='primary'
-                    className='w-full sm:w-fit'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-                    <Icon icon='ic:round-plus' width={24} height={24} />
+                <Icon icon='heroicons:plus' width={20} height={20} />
-                    Tambah
+                Add Location
               </Button>
             </RequirePermission>
           </div>
-            </div>
 
+          {/* Search and Filter */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-              placeholder='Cari Location'
+              placeholder='Search'
-              value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
                 />
-          </div>
+              }
-
+              className={{
-          <div className='flex flex-row justify-end'>
+                wrapper: 'w-full min-w-24 max-w-3xs',
-            <SelectInput
+                inputWrapper: 'rounded-xl! shadow-button-soft',
-              label='Baris'
+                input:
-              options={ROWS_OPTIONS}
+                  'placeholder:font-semibold placeholder:text-base-content/50',
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
               }}
-              onChange={pageSizeChangeHandler}
+            />
-              className={{ wrapper: 'max-w-28' }}
+
+            <ButtonFilter
+              values={tableFilterState}
+              excludeFields={['page', 'pageSize', 'search']}
+              onClick={handleFilterModalOpen}
+              className='px-3 py-2.5'
             />
           </div>
         </div>
 
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(locations) || locations.data?.length === 0 ? (
+            <div className='p-3'>
+              <LocationTableSkeleton
+                columns={locationsColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<Location>
-          data={isResponseSuccess(locations) ? locations?.data : []}
+              data={locations?.data}
               columns={locationsColumns}
               pageSize={tableFilterState.pageSize}
-          page={isResponseSuccess(locations) ? locations?.meta?.page : 0}
+              page={locations?.meta?.page ?? 0}
-          totalItems={
+              totalItems={locations?.meta?.total_results ?? 0}
-            isResponseSuccess(locations) ? locations?.meta?.total_results : 0
-          }
               onPageChange={setPage}
-          isLoading={isLoading}
+              onPageSizeChange={setPageSize}
+              isLoading={false}
               sorting={sorting}
               setSorting={setSorting}
               className={{
-            containerClassName: cn({
+                containerClassName: 'p-3 mb-0',
-              'mb-20':
+                headerColumnClassName: 'text-nowrap',
-                isResponseSuccess(locations) && locations?.data?.length === 0,
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
+        </div>
       </div>
 
       <ConfirmationModal
@@ -327,6 +402,68 @@ const LocationsTable = () => {
           onClick: confirmationModalDeleteClickHandler,
         }}
       />
+
+      {/* Filter Modal */}
+      <Modal
+        ref={filterModal.ref}
+        className={{
+          modal: 'p-0',
+          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
+        }}
+      >
+        {/* Modal Header */}
+        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
+          <div className='flex items-center gap-2 text-primary'>
+            <Icon icon='heroicons:funnel' width={20} height={20} />
+            <h3 className='font-medium text-sm'>Filter Data</h3>
+          </div>
+          <Button
+            variant='link'
+            onClick={filterModal.closeModal}
+            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
+          >
+            <Icon icon='heroicons:x-mark' width={20} height={20} />
+          </Button>
+        </div>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
+          <div className='p-4 flex flex-col gap-1.5'>
+            <SelectInput
+              label='Area'
+              placeholder='Pilih Area'
+              options={areaOptions}
+              value={areaIdValue}
+              onChange={handleFilterAreaChange}
+              onInputChange={setAreaInputValue}
+              isLoading={isLoadingAreaOptions}
+              isClearable
+              onMenuScrollToBottom={loadMoreAreas}
+              className={{ wrapper: 'w-full' }}
+            />
+          </div>
+
+          {/* Modal Footer */}
+          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
+            <Button
+              type='button'
+              variant='soft'
+              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
+              onClick={() => {
+                formik.resetForm();
+                filterModal.closeModal();
+              }}
+            >
+              Reset Filter
+            </Button>
+            <Button
+              type='submit'
+              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
+              disabled={!formik.isValid || formik.isSubmitting}
+            >
+              Apply Filter
+            </Button>
+          </div>
+        </form>
+      </Modal>
     </>
   );
 };

src/components/pages/master-data/location/filter/LocationFilter.ts

@@ -0,0 +1,9 @@
+import { string, object } from 'yup';
+
+export const LocationFilterSchema = object().shape({
+  area_id: string().nullable(),
+});
+
+export type LocationFilterType = {
+  area_id: string | null;
+};

src/components/pages/master-data/location/skeleton/LocationTableSkeleton.tsx

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

src/components/pages/master-data/nonstock/NonstocksTable.tsx

@@ -1,13 +1,8 @@
 'use client';
 
-import { ChangeEventHandler, useCallback, useEffect, useState } from 'react';
+import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
 import useSWR from 'swr';
-import {
+import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
-  CellContext,
-  ColumnDef,
-  ColumnSort,
-  SortingState,
-} from '@tanstack/react-table';
 import toast from 'react-hot-toast';
 
 import { Icon } from '@iconify/react';
@@ -16,75 +11,101 @@ import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import Button from '@/components/Button';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RequirePermission from '@/components/helper/RequirePermission';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
+import NonstockTableSkeleton from '@/components/pages/master-data/nonstock/skeleton/NonstockTableSkeleton';
 
 import { Nonstock } from '@/types/api/master-data/nonstock';
 import { NonstockApi } from '@/services/api/master-data';
-import { cn } from '@/lib/helper';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { ROWS_OPTIONS } from '@/config/constant';
+import { usePathname } from 'next/navigation';
+import { useUiStore } from '@/stores/ui/ui.store';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Nonstock, unknown>;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `nonstock#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-nonstock#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.master.nonstocks.detail'>
             <Button
               href={`/master-data/nonstock/detail/?nonstockId=${props.row.original.id}`}
               variant='ghost'
-          color='primary'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.nonstocks.update'>
             <Button
               href={`/master-data/nonstock/detail/edit/?nonstockId=${props.row.original.id}`}
               variant='ghost'
-          color='warning'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+              <Icon icon='heroicons:pencil-square' width={20} height={20} />
               Edit
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.nonstocks.delete'>
             <Button
-          onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
-          color='error'
+              color='none'
-          className='justify-start text-sm text-error focus-visible:text-error-content hover:text-error-content'
+              className='p-3 justify-start text-sm font-semibold w-full text-error hover:text-error'
             >
-          <Icon
+              <Icon icon='heroicons:trash' width={20} height={20} />
-            icon='material-symbols:delete-outline-rounded'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Delete
             </Button>
           </RequirePermission>
-    </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
 const NonstocksTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -92,16 +113,25 @@ const NonstocksTable = () => {
     setPageSize,
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
-    initial: { search: '', nameSort: '', locationSort: '', picSort: '' },
+    initial: {
+      search: searchValue,
+    },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
-      nameSort: 'sort_name',
-      locationSort: 'sort_location',
-      picSort: ' sort_pic',
     },
   });
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('nonstocks-table', pathname);
+  }, [pathname, setTableState]);
+
+  const [sorting, setSorting] = useState<SortingState>([]);
+
   const {
     data: nonstocks,
     isLoading,
@@ -112,89 +142,16 @@ const NonstocksTable = () => {
   );
 
   const deleteModal = useModal();
-
   const [selectedNonstock, setSelectedNonstock] = useState<
     Nonstock | undefined
   >(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
-  const [sorting, setSorting] = useState<SortingState>([]);
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-
+    setSearchValue(e.target.value);
-  const nonstocksColumns: ColumnDef<Nonstock>[] = [
+    updateFilter('search', e.target.value);
-    {
-      header: '#',
-      cell: (props) =>
-        tableFilterState.pageSize * (tableFilterState.page - 1) +
-        props.row.index +
-        1,
-    },
-    {
-      accessorKey: 'name',
-      header: 'Nama',
-    },
-    {
-      accessorKey: 'uom',
-      header: 'UOM',
-      cell: (props) => props.row.original.uom.name,
-    },
-    {
-      accessorKey: 'suppliers',
-      header: 'Supplier',
-      cell: (props) => {
-        const supplierNames = props.row.original.suppliers.map(
-          (supplier) => supplier.name
-        );
-
-        return supplierNames.join(', ') || '-';
-      },
-    },
-    {
-      accessorKey: 'flags',
-      header: 'Flag',
-      cell: (props) => props.row.original.flags?.join(', ') || '-',
-    },
-    {
-      header: 'Aksi',
-      cell: (props) => {
-        const currentPageSize = props.table.getPaginationRowModel().rows.length;
-        const currentPageRows = props.table.getPaginationRowModel().flatRows;
-        const currentRowRelativeIndex =
-          currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
-
-        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-
-        const deleteClickHandler = () => {
-          setSelectedNonstock(props.row.original);
-          deleteModal.openModal();
   };
 
-        return (
-          <>
-            {currentPageSize > 2 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                <RowOptionsMenu
-                  type='dropdown'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowDropdownOptions>
-            )}
-
-            {currentPageSize <= 2 && (
-              <RowCollapseOptions>
-                <RowOptionsMenu
-                  type='collapse'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowCollapseOptions>
-            )}
-          </>
-        );
-      },
-    },
-  ];
-
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
@@ -215,112 +172,143 @@ const NonstocksTable = () => {
     setIsDeleteLoading(false);
   };
 
-  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+  const nonstocksColumns: ColumnDef<Nonstock>[] = useMemo(
-    updateFilter('search', e.target.value);
+    () => [
-  };
+      {
-
+        header: 'No',
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+        cell: (props) =>
-    const newVal = val as OptionType;
+          tableFilterState.pageSize * (tableFilterState.page - 1) +
-
+          props.row.index +
-    setPageSize(newVal.value as number);
+          1,
-  };
-
-  const updateSortingFilter = useCallback(
-    (
-      sortName: Exclude<keyof typeof tableFilterState, 'page' | 'pageSize'>,
-      sortFilter: ColumnSort | undefined
-    ) => {
-      if (!sortFilter) {
-        updateFilter(sortName, '');
-      } else {
-        updateFilter(sortName, sortFilter.desc ? 'desc' : 'asc');
-      }
       },
-    [updateFilter]
+      {
-  );
+        accessorKey: 'name',
+        header: 'Nama',
+      },
+      {
+        accessorFn: (row) => row.uom?.name ?? '-',
+        header: 'UOM',
+      },
+      {
+        accessorFn: (row) =>
+          row.suppliers?.map((supplier) => supplier.name).join(', ') || '-',
+        header: 'Supplier',
+      },
+      {
+        accessorFn: (row) => row.flags?.join(', ') || '-',
+        header: 'Flag',
+      },
+      {
+        header: 'Aksi',
+        cell: (props: CellContext<Nonstock, unknown>) => {
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
+          const currentPageRows = props.table.getPaginationRowModel().flatRows;
+          const currentRowRelativeIndex =
+            currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-  // track sorting
+          const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-  useEffect(() => {
-    const nameSortFilter = sorting.find((sortItem) => sortItem.id === 'name');
-    const locationSortFilter = sorting.find(
-      (sortItem) => sortItem.id === 'location'
-    );
-    const picSortFilter = sorting.find((sortItem) => sortItem.id === 'pic');
 
-    updateSortingFilter('nameSort', nameSortFilter);
+          const deleteClickHandler = () => {
-    updateSortingFilter('locationSort', locationSortFilter);
+            setSelectedNonstock(props.row.original);
-    updateSortingFilter('picSort', picSortFilter);
+            deleteModal.openModal();
-  }, [sorting]);
+          };
+
+          return (
+            <RowOptionsMenu
+              props={props}
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
+              deleteClickHandler={deleteClickHandler}
+            />
+          );
+        },
+      },
+    ],
+    [tableFilterState.pageSize, tableFilterState.page, deleteModal]
+  );
 
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row'>
+          {/* Action Buttons */}
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.master.nonstocks.create'>
               <Button
                 href='/master-data/nonstock/add'
-                  variant='outline'
                 color='primary'
-                  className='w-full sm:w-fit'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-                  <Icon icon='ic:round-plus' width={24} height={24} />
+                <Icon icon='heroicons:plus' width={20} height={20} />
-                  Tambah
+                Add Nonstock
               </Button>
             </RequirePermission>
           </div>
 
+          {/* Search */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-              placeholder='Cari Nonstock'
+              placeholder='Search'
-              value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
                 />
-          </div>
+              }
-
+              className={{
-          <div className='flex flex-row justify-end'>
+                wrapper: 'w-full min-w-24 max-w-3xs',
-            <SelectInput
+                inputWrapper: 'rounded-xl! shadow-button-soft',
-              label='Baris'
+                input:
-              options={ROWS_OPTIONS}
+                  'placeholder:font-semibold placeholder:text-base-content/50',
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
               }}
-              onChange={pageSizeChangeHandler}
-              className={{ wrapper: 'max-w-28' }}
             />
           </div>
         </div>
 
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(nonstocks) || nonstocks.data?.length === 0 ? (
+            <div className='p-3'>
+              <NonstockTableSkeleton
+                columns={nonstocksColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<Nonstock>
-          data={isResponseSuccess(nonstocks) ? nonstocks?.data : []}
+              data={nonstocks?.data}
               columns={nonstocksColumns}
               pageSize={tableFilterState.pageSize}
-          page={isResponseSuccess(nonstocks) ? nonstocks?.meta?.page : 0}
+              page={nonstocks?.meta?.page ?? 0}
-          totalItems={
+              totalItems={nonstocks?.meta?.total_results ?? 0}
-            isResponseSuccess(nonstocks) ? nonstocks?.meta?.total_results : 0
-          }
               onPageChange={setPage}
-          isLoading={isLoading}
+              onPageSizeChange={setPageSize}
+              isLoading={false}
               sorting={sorting}
               setSorting={setSorting}
               className={{
-            containerClassName: cn({
+                containerClassName: 'p-3 mb-0',
-              'mb-20':
+                headerColumnClassName: 'text-nowrap',
-                isResponseSuccess(nonstocks) && nonstocks?.data?.length === 0,
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
+        </div>
       </div>
 
       <ConfirmationModal

src/components/pages/master-data/nonstock/form/NonstockForm.schema.ts

@@ -17,7 +17,7 @@ export const NonstockFormSchema = Yup.object({
     })
   ),
 
-  flags: Yup.array().of(Yup.string()).notRequired(),
+  flags: Yup.boolean().default(false),
 });
 
 export const UpdateNonstockFormSchema = NonstockFormSchema;

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

@@ -12,6 +12,7 @@ import SelectInput, {
   OptionType,
   useSelect,
 } from '@/components/input/SelectInput';
+import { RadioGroup } from '@/components/input/RadioInput';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import RequirePermission from '@/components/helper/RequirePermission';
@@ -29,8 +30,7 @@ import {
 } from '@/types/api/master-data/nonstock';
 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';
 import { Supplier } from '@/types/api/master-data/supplier';
@@ -97,7 +97,7 @@ const NonstockForm = ({ type = 'add', initialValues }: NonstockFormProps) => {
           label: supplier.name,
         })) ?? [],
 
-      flags: initialValues?.flags ?? [],
+      flags: initialValues?.flags?.includes('EKSPEDISI') ?? false,
     };
   }, [initialValues]);
 
@@ -112,7 +112,7 @@ const NonstockForm = ({ type = 'add', initialValues }: NonstockFormProps) => {
         name: values.name,
         uom_id: values.uomId,
         supplier_ids: values.supplierIds as number[],
-        flags: values.flags as flags[],
+        flags: values.flags ? ['EKSPEDISI'] : [],
       };
 
       switch (type) {
@@ -183,12 +183,8 @@ const NonstockForm = ({ type = 'add', initialValues }: NonstockFormProps) => {
     router.push('/master-data/nonstock');
   };
 
-  const flagsChangeHandler = (val: OptionType | OptionType[] | null) => {
+  const expeditionChangeHandler = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const formattedFlags = (val as OptionType[]).map(
+    formik.setFieldValue('flags', e.target.value === 'true');
-      (flag) => flag.value as string
-    );
-
-    formik.setFieldValue('flags', formattedFlags);
   };
 
   useEffect(() => {
@@ -268,18 +264,19 @@ const NonstockForm = ({ type = 'add', initialValues }: NonstockFormProps) => {
               isDisabled={type === 'detail'}
             />
 
-            <SelectInput
+            <RadioGroup
-              label='Flags'
+              label='Flags Ekspedisi'
-              isMulti
+              name='flags'
-              value={SUPPLIER_FLAG_OPTIONS.filter((opt) =>
+              value={String(formik.values.flags)}
-                formik.values.flags?.includes(opt.value)
+              onChange={expeditionChangeHandler}
-              )}
+              onBlur={formik.handleBlur}
-              onChange={flagsChangeHandler}
+              options={[
-              options={SUPPLIER_FLAG_OPTIONS}
+                { label: 'Ya', value: 'true' },
+                { label: 'Tidak', value: 'false' },
+              ]}
               isError={formik.touched.flags && Boolean(formik.errors.flags)}
               errorMessage={formik.errors.flags as string}
-              isDisabled={type === 'detail'}
+              disabled={type === 'detail'}
-              isClearable
             />
           </div>
 

src/components/pages/master-data/nonstock/skeleton/NonstockTableSkeleton.tsx

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

src/components/pages/master-data/product-category/ProductCategoryTable.tsx

@@ -1,6 +1,7 @@
 'use client';
 
-import { ChangeEventHandler, useEffect, useRef, useState } from 'react';
+import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
+import { usePathname } from 'next/navigation';
 import useSWR from 'swr';
 import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 import toast from 'react-hot-toast';
@@ -11,78 +12,99 @@ import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import Button from '@/components/Button';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RequirePermission from '@/components/helper/RequirePermission';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
+import ProductCategoryTableSkeleton from '@/components/pages/master-data/product-category/skeleton/ProductCategoryTableSkeleton';
 
 import { ProductCategory } from '@/types/api/master-data/product-category';
 import { ProductCategoryApi } from '@/services/api/master-data';
-import { cn } from '@/lib/helper';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
 import { useUiStore } from '@/stores/ui/ui.store';
-import { ROWS_OPTIONS } from '@/config/constant';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<ProductCategory, unknown>;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `product-category#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-product-category#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.master.product_categories.detail'>
             <Button
               href={`/master-data/product-category/detail/?productCategoryId=${props.row.original.id}`}
               variant='ghost'
-          color='primary'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.product_categories.update'>
             <Button
               href={`/master-data/product-category/detail/edit/?productCategoryId=${props.row.original.id}`}
               variant='ghost'
-          color='warning'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='mdi:pencil-outline' width={16} height={16} />
+              <Icon icon='heroicons:pencil-square' width={20} height={20} />
               Edit
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.product_categories.delete'>
             <Button
-          onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
-          color='error'
+              color='none'
-          className='justify-start text-sm text-error focus-visible:text-error-content hover:text-error-content'
+              className='p-3 justify-start text-sm font-semibold w-full text-error hover:text-error'
             >
-          <Icon
+              <Icon icon='heroicons:trash' width={20} height={20} />
-            icon='mdi:delete-outline'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Delete
             </Button>
           </RequirePermission>
-    </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
 const ProductCategoryTable = () => {
-  const { searchValue, setSearchValue, resetSearchValue } = useUiStore();
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
-  const previousPathRef = useRef<string | null>(null);
+  const pathname = usePathname();
 
   const {
     state: tableFilterState,
@@ -91,10 +113,21 @@ const ProductCategoryTable = () => {
     setPageSize,
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
-    initial: { search: searchValue, nameSort: '' },
+    initial: {
-    paramMap: { page: 'page', pageSize: 'limit', nameSort: 'sort_name' },
+      search: '',
+    },
+    paramMap: {
+      page: 'page',
+      pageSize: 'limit',
+    },
   });
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  const [sorting, setSorting] = useState<SortingState>([]);
+
   const {
     data: productCategories,
     isLoading,
@@ -105,72 +138,16 @@ const ProductCategoryTable = () => {
   );
 
   const deleteModal = useModal();
-
   const [selectedProductCategory, setSelectedProductCategory] = useState<
     ProductCategory | undefined
   >(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
-  const [sorting, setSorting] = useState<SortingState>([]);
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-
+    setSearchValue(e.target.value);
-  const productCategoryColumns: ColumnDef<ProductCategory>[] = [
+    updateFilter('search', e.target.value);
-    {
-      header: '#',
-      cell: (props) =>
-        tableFilterState.pageSize * (tableFilterState.page - 1) +
-        props.row.index +
-        1,
-    },
-    {
-      accessorKey: 'code',
-      header: 'Code',
-    },
-    {
-      accessorKey: 'name',
-      header: 'Nama',
-    },
-    {
-      header: 'Aksi',
-      cell: (props) => {
-        const currentPageSize = props.table.getPaginationRowModel().rows.length;
-        const currentPageRows = props.table.getPaginationRowModel().flatRows;
-        const currentRowRelativeIndex =
-          currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
-
-        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-
-        const deleteClickHandler = () => {
-          setSelectedProductCategory(props.row.original);
-          deleteModal.openModal();
   };
 
-        return (
-          <>
-            {currentPageSize > 2 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                <RowOptionsMenu
-                  type='dropdown'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowDropdownOptions>
-            )}
-
-            {currentPageSize <= 2 && (
-              <RowCollapseOptions>
-                <RowOptionsMenu
-                  type='collapse'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowCollapseOptions>
-            )}
-          </>
-        );
-      },
-    },
-  ];
-
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
@@ -191,123 +168,141 @@ const ProductCategoryTable = () => {
     setIsDeleteLoading(false);
   };
 
-  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+  const productCategoryColumns: ColumnDef<ProductCategory>[] = useMemo(
-    setSearchValue(e.target.value);
+    () => [
-    updateFilter('search', e.target.value);
+      {
+        header: 'No',
+        cell: (props) =>
+          tableFilterState.pageSize * (tableFilterState.page - 1) +
+          props.row.index +
+          1,
+      },
+      {
+        accessorKey: 'code',
+        header: 'Code',
+      },
+      {
+        accessorKey: 'name',
+        header: 'Nama',
+      },
+      {
+        header: 'Aksi',
+        cell: (props: CellContext<ProductCategory, unknown>) => {
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
+          const currentPageRows = props.table.getPaginationRowModel().flatRows;
+          const currentRowRelativeIndex =
+            currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
+
+          const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+
+          const deleteClickHandler = () => {
+            setSelectedProductCategory(props.row.original);
+            deleteModal.openModal();
           };
 
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+          return (
-    const newVal = val as OptionType;
+            <RowOptionsMenu
-    setPageSize(newVal.value as number);
+              props={props}
-  };
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
-
+              deleteClickHandler={deleteClickHandler}
-  useEffect(() => {
+            />
-    // Store current path on mount
-    previousPathRef.current = window.location.pathname;
-
-    return () => {
-      const currentPath = window.location.pathname;
-
-      // if both paths are within /master-data/product-category module
-      const isCurrentPathProductCategory = currentPath.includes(
-        '/master-data/product-category'
           );
-      const isPreviousPathProductCategory = previousPathRef.current?.includes(
+        },
-        '/master-data/product-category'
+      },
+    ],
+    [tableFilterState.pageSize, tableFilterState.page, deleteModal]
   );
 
-      // reset if we outside product category module entirely
-      if (isPreviousPathProductCategory && !isCurrentPathProductCategory) {
-        resetSearchValue();
-      }
-    };
-  }, [resetSearchValue]);
-
   useEffect(() => {
-    const isNameSorted = sorting.find((sortItem) => sortItem.id === 'name');
+    setTableState('product-category-table', pathname);
-    if (!isNameSorted) {
+  }, [pathname, setTableState]);
-      updateFilter('nameSort', '');
-    } else {
-      updateFilter('nameSort', isNameSorted.desc ? 'desc' : 'asc');
-    }
-  }, [sorting, updateFilter]);
 
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row'>
+          {/* Action Buttons */}
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.master.product_categories.create'>
               <Button
                 href='/master-data/product-category/add'
-                  variant='outline'
                 color='primary'
-                  className='w-full sm:w-fit'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-                  <Icon icon='ic:round-plus' width={24} height={24} />
+                <Icon icon='heroicons:plus' width={20} height={20} />
-                  Tambah
+                Add Product Category
               </Button>
             </RequirePermission>
           </div>
+
+          {/* Search */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-              placeholder='Cari Product Category'
+              placeholder='Search'
-              value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
                 />
-          </div>
-          <div className='flex flex-row justify-end'>
-            <SelectInput
-              label='Baris'
-              options={ROWS_OPTIONS}
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
-              }}
-              onChange={pageSizeChangeHandler}
-              className={{ wrapper: 'max-w-28' }}
-            />
-          </div>
-        </div>
-        <Table<ProductCategory>
-          data={
-            isResponseSuccess(productCategories) ? productCategories?.data : []
               }
+              className={{
+                wrapper: 'w-full min-w-24 max-w-3xs',
+                inputWrapper: 'rounded-xl! shadow-button-soft',
+                input:
+                  'placeholder:font-semibold placeholder:text-base-content/50',
+              }}
+            />
+          </div>
+        </div>
+
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(productCategories) ||
+            productCategories.data?.length === 0 ? (
+            <div className='p-3'>
+              <ProductCategoryTableSkeleton
+                columns={productCategoryColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
+            <Table<ProductCategory>
+              data={productCategories?.data}
               columns={productCategoryColumns}
               pageSize={tableFilterState.pageSize}
-          page={
+              page={productCategories?.meta?.page ?? 0}
-            isResponseSuccess(productCategories)
+              totalItems={productCategories?.meta?.total_results ?? 0}
-              ? productCategories?.meta?.page
-              : 0
-          }
-          totalItems={
-            isResponseSuccess(productCategories)
-              ? productCategories?.meta?.total_results
-              : 0
-          }
               onPageChange={setPage}
-          isLoading={isLoading}
+              onPageSizeChange={setPageSize}
+              isLoading={false}
               sorting={sorting}
               setSorting={setSorting}
               className={{
-            containerClassName: cn({
+                containerClassName: 'p-3 mb-0',
-              'mb-20':
+                headerColumnClassName: 'text-nowrap',
-                isResponseSuccess(productCategories) &&
-                productCategories?.data?.length === 0,
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
         </div>
+      </div>
+
       <ConfirmationModal
         ref={deleteModal.ref}
         type='error'

src/components/pages/master-data/product-category/skeleton/ProductCategoryTableSkeleton.tsx

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

src/components/pages/master-data/product/ProductTable.tsx

@@ -1,52 +1,88 @@
 'use client';
 
-import { ChangeEventHandler, useCallback, useEffect, useState } from 'react';
-import useSWR from 'swr';
 import {
-  CellContext,
+  ChangeEventHandler,
-  ColumnDef,
+  useCallback,
-  ColumnSort,
+  useEffect,
-  SortingState,
+  useMemo,
-} from '@tanstack/react-table';
+  useState,
+} from 'react';
+import { usePathname } from 'next/navigation';
+import useSWR from 'swr';
+import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 import toast from 'react-hot-toast';
+import { useFormik } from 'formik';
 
 import { Icon } from '@iconify/react';
 import Table from '@/components/Table';
 import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import Button from '@/components/Button';
-import { useModal } from '@/components/Modal';
+import Modal, { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RequirePermission from '@/components/helper/RequirePermission';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
+import ProductTableSkeleton from '@/components/pages/master-data/product/skeleton/ProductTableSkeleton';
+import SelectInput, { useSelect } from '@/components/input/SelectInput';
+import { OptionType } from '@/components/input/SelectInput';
+import ButtonFilter from '@/components/helper/ButtonFilter';
 
 import { Product } from '@/types/api/master-data/product';
-import { ProductApi } from '@/services/api/master-data';
+import { ProductCategory } from '@/types/api/master-data/product-category';
-import { cn } from '@/lib/helper';
+import { ProductApi, ProductCategoryApi } from '@/services/api/master-data';
+import { formatCurrency } from '@/lib/helper';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { ROWS_OPTIONS } from '@/config/constant';
+import { useUiStore } from '@/stores/ui/ui.store';
+import {
+  ProductFilterSchema,
+  ProductFilterType,
+} from '@/components/pages/master-data/product/filter/ProductFilter';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Product, unknown>;
   deleteClickHandler: () => void;
-}) => (
+}) => {
-  <RowOptionsMenuWrapper type={type}>
+  const popoverId = `product#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-product#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
+  return (
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.master.products.detail'>
             <Button
               href={`/master-data/product/detail/?productId=${props.row.original.id}`}
               variant='ghost'
-        color='primary'
+              color='none'
-        className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-        <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
@@ -54,33 +90,38 @@ const RowOptionsMenu = ({
             <Button
               href={`/master-data/product/detail/edit/?productId=${props.row.original.id}`}
               variant='ghost'
-        color='warning'
+              color='none'
-        className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-        <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+              <Icon icon='heroicons:pencil-square' width={20} height={20} />
               Edit
             </Button>
           </RequirePermission>
           <RequirePermission permissions='lti.master.products.delete'>
             <Button
-        onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
-        color='error'
+              color='none'
-        className='justify-start text-sm text-error focus-visible:text-error-content hover:text-error-content'
+              className='p-3 justify-start text-sm font-semibold w-full text-error hover:text-error'
             >
-        <Icon
+              <Icon icon='heroicons:trash' width={20} height={20} />
-          icon='material-symbols:delete-outline-rounded'
-          width={16}
-          height={16}
-          className='justify-start text-sm'
-        />
               Delete
             </Button>
           </RequirePermission>
-  </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
+};
 
 const ProductsTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -90,21 +131,80 @@ const ProductsTable = () => {
   } = useTableFilter({
     initial: {
       search: '',
-      nameSort: '',
+      productCategoryFilter: '',
-      skuSort: '',
-      brandSort: '',
-      categorySort: '',
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
-      nameSort: 'sort_name',
+      productCategoryFilter: 'product_category_id',
-      skuSort: 'sort_sku',
-      brandSort: 'sort_brand',
-      categorySort: 'sort_category',
     },
   });
 
+  // ===== FILTER MODAL STATE =====
+  const filterModal = useModal();
+
+  // ===== FORMIK SETUP =====
+  const formik = useFormik<ProductFilterType>({
+    initialValues: {
+      product_category_id: null,
+    },
+    validationSchema: ProductFilterSchema,
+    onSubmit: (values, { setSubmitting }) => {
+      updateFilter('productCategoryFilter', values.product_category_id || '');
+      filterModal.closeModal();
+      setSubmitting(false);
+    },
+    onReset: () => {
+      updateFilter('productCategoryFilter', '');
+    },
+  });
+
+  // ===== PRODUCT CATEGORY OPTIONS =====
+  const {
+    setInputValue: setProductCategoryInputValue,
+    options: productCategoryOptions,
+    isLoadingOptions: isLoadingProductCategoryOptions,
+    loadMore: loadMoreProductCategories,
+  } = useSelect<ProductCategory>(
+    filterModal.open ? ProductCategoryApi.basePath : null,
+    'id',
+    'name',
+    'search'
+  );
+
+  // ===== FILTER HANDLERS =====
+  const handleFilterProductCategoryChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const category = val as OptionType | null;
+      const categoryId = category?.value ? String(category.value) : null;
+
+      formik.setFieldValue('product_category_id', categoryId);
+    },
+    [formik]
+  );
+
+  // ===== FILTER HELPERS =====
+  const productCategoryIdValue = useMemo(() => {
+    if (!formik.values.product_category_id) return null;
+    return (
+      productCategoryOptions.find(
+        (opt) => String(opt.value) === formik.values.product_category_id
+      ) || null
+    );
+  }, [formik.values.product_category_id, productCategoryOptions]);
+
+  // ===== HANDLE FILTER MODAL OPEN =====
+  const handleFilterModalOpen = () => {
+    filterModal.openModal();
+    formik.validateForm();
+  };
+
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  const [sorting, setSorting] = useState<SortingState>([]);
+
   const {
     data: products,
     isLoading,
@@ -119,115 +219,16 @@ const ProductsTable = () => {
     undefined
   );
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
-  const [sorting, setSorting] = useState<SortingState>([]);
 
-  const productsColumns: ColumnDef<Product>[] = [
+  useEffect(() => {
-    {
+    setTableState('product-table', pathname);
-      header: '#',
+  }, [pathname, setTableState]);
-      cell: (props) =>
-        tableFilterState.pageSize * (tableFilterState.page - 1) +
-        props.row.index +
-        1,
-    },
-    {
-      accessorKey: 'name',
-      header: 'Nama',
-    },
-    {
-      accessorKey: 'sku',
-      header: 'SKU',
-    },
-    {
-      accessorKey: 'brand',
-      header: 'Merek',
-    },
-    {
-      accessorKey: 'product_category',
-      header: 'Kategori',
-      cell: (props) => props.row.original.product_category?.name ?? '-',
-    },
-    {
-      accessorKey: 'uom',
-      header: 'Satuan',
-      cell: (props) => props.row.original.uom?.name ?? '-',
-    },
-    {
-      accessorKey: 'product_price',
-      header: 'Harga Produk',
-      cell: (props) =>
-        props.row.original.product_price?.toLocaleString() ?? '-',
-    },
-    {
-      accessorKey: 'selling_price',
-      header: 'Harga Jual',
-      cell: (props) =>
-        props.row.original.selling_price?.toLocaleString() ?? '-',
-    },
-    {
-      accessorKey: 'tax',
-      header: 'Pajak (%)',
-      cell: (props) => props.row.original.tax ?? '-',
-    },
-    {
-      accessorKey: 'expiry_period',
-      header: 'Kadaluarsa (hari)',
-      cell: (props) => props.row.original.expiry_period ?? '-',
-    },
-    {
-      accessorKey: 'suppliers',
-      header: 'Supplier',
-      cell: (props) =>
-        props.row.original.suppliers?.map((s) => s.name).join(', ') || '-',
-    },
-    {
-      accessorKey: 'flags',
-      header: 'Flags',
-      cell: (props) =>
-        props.row.original.flags?.length
-          ? props.row.original.flags.join(', ')
-          : '-',
-    },
-    {
-      header: 'Aksi',
-      cell: (props) => {
-        const currentPageSize = props.table.getPaginationRowModel().rows.length;
-        const currentPageRows = props.table.getPaginationRowModel().flatRows;
-        const currentRowRelativeIndex =
-          currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-
+    setSearchValue(e.target.value);
-        const deleteClickHandler = () => {
+    updateFilter('search', e.target.value);
-          setSelectedProduct(props.row.original);
-          deleteModal.openModal();
   };
 
-        return (
-          <>
-            {currentPageSize > 2 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                <RowOptionsMenu
-                  type='dropdown'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowDropdownOptions>
-            )}
-            {currentPageSize <= 2 && (
-              <RowCollapseOptions>
-                <RowOptionsMenu
-                  type='collapse'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowCollapseOptions>
-            )}
-          </>
-        );
-      },
-    },
-  ];
-
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
@@ -248,110 +249,197 @@ const ProductsTable = () => {
     setIsDeleteLoading(false);
   };
 
-  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+  const productsColumns: ColumnDef<Product>[] = useMemo(
-    updateFilter('search', e.target.value);
+    () => [
-  };
+      {
-
+        header: 'No',
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+        cell: (props) =>
-    const newVal = val as OptionType;
+          tableFilterState.pageSize * (tableFilterState.page - 1) +
-    setPageSize(newVal.value as number);
+          props.row.index +
-  };
+          1,
-
-  const updateSortingFilter = useCallback(
-    (
-      sortName: Exclude<keyof typeof tableFilterState, 'page' | 'pageSize'>,
-      sortFilter: ColumnSort | undefined
-    ) => {
-      if (!sortFilter) {
-        updateFilter(sortName, '');
-      } else {
-        updateFilter(sortName, sortFilter.desc ? 'desc' : 'asc');
-      }
       },
-    [updateFilter]
+      {
-  );
+        accessorKey: 'name',
+        header: 'Nama',
+      },
+      {
+        accessorKey: 'sku',
+        header: 'SKU',
+      },
+      {
+        accessorKey: 'brand',
+        header: 'Merek',
+      },
+      {
+        accessorFn: (row) => row.product_category?.name ?? '-',
+        header: 'Kategori',
+      },
+      {
+        accessorFn: (row) => row.uom?.name ?? '-',
+        header: 'Satuan',
+      },
+      {
+        accessorKey: 'product_price',
+        header: 'Harga Produk',
+        cell: (props) =>
+          props.row.original.product_price
+            ? formatCurrency(props.row.original.product_price)
+            : '-',
+      },
+      {
+        accessorKey: 'selling_price',
+        header: 'Harga Jual',
+        cell: (props) =>
+          props.row.original.selling_price
+            ? formatCurrency(props.row.original.selling_price)
+            : '-',
+      },
+      {
+        accessorKey: 'tax',
+        header: 'Pajak (%)',
+        cell: (props) => props.row.original.tax ?? '-',
+      },
+      {
+        accessorKey: 'expiry_period',
+        header: 'Kadaluarsa (hari)',
+        cell: (props) => props.row.original.expiry_period ?? '-',
+      },
+      {
+        accessorFn: (row) =>
+          row.suppliers?.map((s) => s.name).join(', ') || '-',
+        header: 'Supplier',
+      },
+      {
+        accessorKey: 'flag',
+        header: 'Flag',
+        cell: (props) =>
+          props.row.original.flag ? props.row.original.flag : '-',
+      },
+      {
+        accessorFn: (row) =>
+          row.sub_flags?.length ? row.sub_flags.join(', ') : '-',
+        header: 'Kategori Flags',
+      },
+      {
+        header: 'Aksi',
+        cell: (props: CellContext<Product, unknown>) => {
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
+          const currentPageRows = props.table.getPaginationRowModel().flatRows;
+          const currentRowRelativeIndex =
+            currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-  useEffect(() => {
+          const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-    const nameSortFilter = sorting.find((sortItem) => sortItem.id === 'name');
-    const skuSortFilter = sorting.find((sortItem) => sortItem.id === 'sku');
-    const brandSortFilter = sorting.find((sortItem) => sortItem.id === 'brand');
-    const categorySortFilter = sorting.find(
-      (sortItem) => sortItem.id === 'product_category'
-    );
 
-    updateSortingFilter('nameSort', nameSortFilter);
+          const deleteClickHandler = () => {
-    updateSortingFilter('skuSort', skuSortFilter);
+            setSelectedProduct(props.row.original);
-    updateSortingFilter('brandSort', brandSortFilter);
+            deleteModal.openModal();
-    updateSortingFilter('categorySort', categorySortFilter);
+          };
-  }, [sorting, updateSortingFilter]);
+
+          return (
+            <RowOptionsMenu
+              props={props}
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
+              deleteClickHandler={deleteClickHandler}
+            />
+          );
+        },
+      },
+    ],
+    [tableFilterState.pageSize, tableFilterState.page, deleteModal]
+  );
 
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row'>
+          {/* Action Buttons */}
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.master.products.create'>
               <Button
                 href='/master-data/product/add'
-                  variant='outline'
-                  className='w-full sm:w-fit'
                 color='primary'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-                  <Icon icon='ic:round-plus' width={24} height={24} />
+                <Icon icon='heroicons:plus' width={20} height={20} />
-                  Tambah
+                Add Product
               </Button>
             </RequirePermission>
           </div>
+
+          {/* Search and Filter */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-              placeholder='Cari Produk'
+              placeholder='Search'
-              value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
                 />
-          </div>
+              }
-          <div className='flex flex-row justify-end'>
+              className={{
-            <SelectInput
+                wrapper: 'w-full min-w-24 max-w-3xs',
-              label='Baris'
+                inputWrapper: 'rounded-xl! shadow-button-soft',
-              options={ROWS_OPTIONS}
+                input:
-              value={{
+                  'placeholder:font-semibold placeholder:text-base-content/50',
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
               }}
-              onChange={pageSizeChangeHandler}
+            />
-              className={{ wrapper: 'max-w-28' }}
+
+            <ButtonFilter
+              values={tableFilterState}
+              excludeFields={['page', 'pageSize', 'search']}
+              onClick={handleFilterModalOpen}
+              className='px-3 py-2.5'
             />
           </div>
         </div>
+
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(products) || products.data?.length === 0 ? (
+            <div className='p-3'>
+              <ProductTableSkeleton
+                columns={productsColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<Product>
-          data={isResponseSuccess(products) ? products?.data : []}
+              data={products?.data}
               columns={productsColumns}
               pageSize={tableFilterState.pageSize}
-          page={isResponseSuccess(products) ? products?.meta?.page : 0}
+              page={products?.meta?.page ?? 0}
-          totalItems={
+              totalItems={products?.meta?.total_results ?? 0}
-            isResponseSuccess(products) ? products?.meta?.total_results : 0
-          }
               onPageChange={setPage}
-          isLoading={isLoading}
+              onPageSizeChange={setPageSize}
+              isLoading={false}
               sorting={sorting}
               setSorting={setSorting}
               className={{
-            containerClassName: cn({
+                containerClassName: 'p-3 mb-0',
-              'mb-20':
+                headerColumnClassName: 'text-nowrap',
-                isResponseSuccess(products) && products?.data?.length === 0,
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
         </div>
+      </div>
+
       <ConfirmationModal
         ref={deleteModal.ref}
         type='error'
@@ -366,6 +454,68 @@ const ProductsTable = () => {
           onClick: confirmationModalDeleteClickHandler,
         }}
       />
+
+      {/* Filter Modal */}
+      <Modal
+        ref={filterModal.ref}
+        className={{
+          modal: 'p-0',
+          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
+        }}
+      >
+        {/* Modal Header */}
+        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
+          <div className='flex items-center gap-2 text-primary'>
+            <Icon icon='heroicons:funnel' width={20} height={20} />
+            <h3 className='font-medium text-sm'>Filter Data</h3>
+          </div>
+          <Button
+            variant='link'
+            onClick={filterModal.closeModal}
+            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
+          >
+            <Icon icon='heroicons:x-mark' width={20} height={20} />
+          </Button>
+        </div>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
+          <div className='p-4 flex flex-col gap-1.5'>
+            <SelectInput
+              label='Kategori Produk'
+              placeholder='Pilih Kategori Produk'
+              options={productCategoryOptions}
+              value={productCategoryIdValue}
+              onChange={handleFilterProductCategoryChange}
+              onInputChange={setProductCategoryInputValue}
+              isLoading={isLoadingProductCategoryOptions}
+              isClearable
+              onMenuScrollToBottom={loadMoreProductCategories}
+              className={{ wrapper: 'w-full' }}
+            />
+          </div>
+
+          {/* Modal Footer */}
+          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
+            <Button
+              type='button'
+              variant='soft'
+              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
+              onClick={() => {
+                formik.resetForm();
+                filterModal.closeModal();
+              }}
+            >
+              Reset Filter
+            </Button>
+            <Button
+              type='submit'
+              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
+              disabled={!formik.isValid || formik.isSubmitting}
+            >
+              Apply Filter
+            </Button>
+          </div>
+        </form>
+      </Modal>
     </>
   );
 };

src/components/pages/master-data/product/filter/ProductFilter.ts

@@ -0,0 +1,9 @@
+import { string, object } from 'yup';
+
+export const ProductFilterSchema = object().shape({
+  product_category_id: string().nullable(),
+});
+
+export type ProductFilterType = {
+  product_category_id: string | null;
+};

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

@@ -1,4 +1,5 @@
 import * as Yup from 'yup';
+import { PRODUCT_FLAG_MAPPING } from '@/config/constant';
 
 type ProductFormSchemaType = {
   name: string;
@@ -25,7 +26,8 @@ type ProductFormSchemaType = {
     } | null;
     price: number;
   }[];
-  flags: string[];
+  flag: string;
+  sub_flags?: string[];
 };
 
 export const ProductFormSchema: Yup.ObjectSchema<ProductFormSchemaType> =
@@ -94,10 +96,26 @@ export const ProductFormSchema: Yup.ObjectSchema<ProductFormSchemaType> =
       )
       .required('Supplier wajib diisi!'),
 
-    flags: Yup.array()
+    flag: Yup.string()
+      .min(1, 'Flag wajib diisi!')
+      .required('Flag wajib diisi!')
+      .typeError('Flag wajib diisi!'),
+
+    sub_flags: Yup.array()
       .of(Yup.string().required())
-      .min(1, 'Minimal harus ada 1 flag!')
+      .when('flag', {
-      .required('Flag wajib diisi!'),
+        is: (flag: string) => {
+          const mapping = PRODUCT_FLAG_MAPPING.options.find(
+            (opt) => opt.flag.value === flag
+          );
+          return mapping?.allow_without_sub_flag === false;
+        },
+        then: (schema) =>
+          schema
+            .required('Sub flag wajib diisi!')
+            .min(1, 'Sub flag wajib diisi!'),
+        otherwise: (schema) => schema,
+      }),
   });
 
 export const UpdateProductFormSchema = ProductFormSchema;

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

@@ -36,8 +36,16 @@ import {
   ProductApi,
 } from '@/services/api/master-data';
 import { cn } from '@/lib/helper';
-import { PRODUCT_FLAG_OPTIONS } from '@/config/constant';
+
 import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
+import { ConstantsApi } from '@/services/api/constants/constants';
+import type {
+  TransformedConstants,
+  ProductFlagMapping,
+} from '@/types/api/constants/constants';
+import useSWR from 'swr';
+import { PRODUCT_FLAG_MAPPING } from '@/config/constant';
+
 import { Supplier } from '@/types/api/master-data/supplier';
 import Card from '@/components/Card';
 import { removeArrayItemAndSync } from '@/lib/utils/formik';
@@ -53,6 +61,24 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
 
   const [productFormErrorMessage, setProductFormErrorMessage] = useState('');
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
+  const {
+    data: constants,
+    error: constantsError,
+    isLoading: isLoadingConstants,
+  } = useSWR<TransformedConstants | undefined>(
+    'constants',
+    ConstantsApi.fetchTransformedConstants.bind(ConstantsApi),
+    {
+      shouldRetryOnError: false,
+    }
+  );
+
+  const productFlagMapping: ProductFlagMapping | null = useMemo(() => {
+    if (constantsError || !constants?.product_flag_mapping) {
+      return PRODUCT_FLAG_MAPPING as unknown as ProductFlagMapping;
+    }
+    return constants.product_flag_mapping;
+  }, [constants, constantsError]);
 
   const createProductHandler = useCallback(
     async (payload: CreateProductPayload) => {
@@ -110,7 +136,8 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
             price: supplier.price,
           }))
         : [],
-      flags: initialValues?.flags ?? [],
+      flag: initialValues?.flag ?? '',
+      sub_flags: initialValues?.sub_flags ?? [],
     }),
     [initialValues]
   );
@@ -139,7 +166,8 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
           supplier_id: s.supplier?.value as number,
           price: parseInt(s.price.toString()) || 0,
         })),
-        flags: values.flags.filter((f): f is string => typeof f === 'string'),
+        flag: values.flag,
+        sub_flags: values.sub_flags,
       };
       switch (type) {
         case 'add':
@@ -200,6 +228,28 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
     });
   }, [supplierOptions, formik.values.suppliers]);
 
+  const selectedFlagMapping = useMemo(() => {
+    return productFlagMapping?.options.find(
+      (opt) => opt.flag.value === formik.values.flag
+    );
+  }, [formik.values.flag, productFlagMapping]);
+
+  const subFlagOptions = useMemo<OptionType[]>(() => {
+    return selectedFlagMapping?.sub_flags ?? [];
+  }, [selectedFlagMapping]);
+
+  const selectedSubFlagValues = useMemo<OptionType[]>(() => {
+    return (
+      selectedFlagMapping?.sub_flags.filter((subFlag) =>
+        formik.values.sub_flags?.includes(subFlag.value as string)
+      ) ?? []
+    );
+  }, [selectedFlagMapping, formik.values.sub_flags]);
+
+  const isSubFlagRequired = useMemo(() => {
+    return selectedFlagMapping?.allow_without_sub_flag === false;
+  }, [selectedFlagMapping]);
+
   const addSupplierHandler = () => {
     formik.setFieldValue('suppliers', [
       ...formik.values.suppliers,
@@ -213,7 +263,6 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
   const deleteSupplierItemHandler = (idx: number) => {
     const path = 'suppliers';
 
-    // trims values, errors, and touched at idx
     removeArrayItemAndSync(formik, path, idx);
   };
 
@@ -428,26 +477,48 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
                 readOnly={type === 'detail'}
               />
             </div>
-            <div className='grid sm:grid-cols-1 gap-4'>
+            <div className='grid grid-cols-1 sm:grid-cols-2 gap-4'>
               <SelectInput
                 required
                 label='Flags'
                 placeholder='Pilih flags...'
-                isMulti
+                value={productFlagMapping?.flags.find(
-                value={PRODUCT_FLAG_OPTIONS.filter((opt) =>
+                  (opt) => opt.value === formik.values.flag
-                  (formik.values.flags || []).includes(opt.value)
                 )}
+                onChange={(val) => {
+                  const selectedFlag = String((val as OptionType)?.value ?? '');
+                  formik.setFieldValue('flag', selectedFlag);
+                  formik.setFieldValue('sub_flags', []);
+                }}
+                options={productFlagMapping?.flags ?? []}
+                isLoading={isLoadingConstants && !productFlagMapping}
+                isError={formik.touched.flag && Boolean(formik.errors.flag)}
+                errorMessage={formik.errors.flag as string}
+                isDisabled={type === 'detail'}
+                isClearable
+              />
+
+              <SelectInput
+                label='Kategori Flags'
+                placeholder='Pilih kategori flags...'
+                isMulti
+                required={isSubFlagRequired}
+                value={selectedSubFlagValues}
                 onChange={(val) => {
                   const arr = Array.isArray(val) ? val : val ? [val] : [];
                   formik.setFieldValue(
-                    'flags',
+                    'sub_flags',
-                    arr.map((v) => (v as OptionType).value)
+                    arr.map((v) => String((v as OptionType).value))
                   );
                 }}
-                options={PRODUCT_FLAG_OPTIONS}
+                options={subFlagOptions}
-                isError={formik.touched.flags && Boolean(formik.errors.flags)}
+                isLoading={isLoadingConstants && !productFlagMapping}
-                errorMessage={formik.errors.flags as string}
+                isError={
-                isDisabled={type === 'detail'}
+                  formik.touched.sub_flags && Boolean(formik.errors.sub_flags)
+                }
+                errorMessage={formik.errors.sub_flags as string}
+                isDisabled={type === 'detail' || !formik.values.flag}
+                closeMenuOnSelect={false}
                 isClearable
               />
             </div>

src/components/pages/master-data/product/skeleton/ProductTableSkeleton.tsx

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

src/components/pages/master-data/production-standard/ProductionStandardTable.tsx

@@ -1,92 +1,211 @@
 'use client';
 
-import Button from '@/components/Button';
+import { useCallback, useEffect, useMemo, useState } from 'react';
-import Table, { TABLE_DEFAULT_STYLING } from '@/components/Table';
+import { usePathname } from 'next/navigation';
-import { ProductionStandard } from '@/types/api/master-data/production-standard';
-import { Icon } from '@iconify/react';
 import useSWR from 'swr';
+import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
+import toast from 'react-hot-toast';
+import { useFormik } from 'formik';
+
+import { Icon } from '@iconify/react';
+import Table from '@/components/Table';
+import Button from '@/components/Button';
+import Modal, { useModal } from '@/components/Modal';
+import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import RequirePermission from '@/components/helper/RequirePermission';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
+import ProductionStandardTableSkeleton from '@/components/pages/master-data/production-standard/skeleton/ProductionStandardTableSkeleton';
+import { OptionType } from '@/components/input/SelectInput';
+import ButtonFilter from '@/components/helper/ButtonFilter';
+
+import { ProductionStandard } from '@/types/api/master-data/production-standard';
 import { ProductionStandardApi } from '@/services/api/master-data';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
+import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { CellContext } from '@tanstack/react-table';
+import { useUiStore } from '@/stores/ui/ui.store';
-import { useModal } from '@/components/Modal';
+import {
-import { useState } from 'react';
+  ProductionStandardFilterSchema,
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
+  ProductionStandardFilterType,
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
+} from '@/components/pages/master-data/production-standard/filter/ProductionStandardFilter';
-import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import SelectInputRadio from '@/components/input/SelectInputRadio';
-import toast from 'react-hot-toast';
-import { cn } from '@/lib/helper';
-import RequirePermission from '@/components/helper/RequirePermission';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<ProductionStandard, unknown>;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `production-standard#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-production-standard#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.master.production_standards.detail'>
             <Button
               href={`/master-data/production-standard/detail/?productionStandardId=${props.row.original.id}`}
               variant='ghost'
-          color='primary'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.production_standards.update'>
             <Button
               href={`/master-data/production-standard/detail/edit/?productionStandardId=${props.row.original.id}`}
               variant='ghost'
-          color='warning'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+              <Icon icon='heroicons:pencil-square' width={20} height={20} />
               Edit
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.production_standards.delete'>
             <Button
-          onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
-          color='error'
+              color='none'
-          className='text-error hover:text-inherit'
+              className='p-3 justify-start text-sm font-semibold w-full text-error hover:text-error'
             >
-          <Icon
+              <Icon icon='heroicons:trash' width={20} height={20} />
-            icon='material-symbols:delete-outline-rounded'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Delete
             </Button>
           </RequirePermission>
-    </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
 const ProductionStandardTable = () => {
-  const deleteModal = useModal();
+  const { setTableState } = useUiStore();
+  const pathname = usePathname();
 
+  const {
+    state: tableFilterState,
+    updateFilter,
+    setPage,
+    setPageSize,
+    toQueryString: getTableFilterQueryString,
+  } = useTableFilter({
+    initial: {
+      projectCategoryFilter: '',
+    },
+    paramMap: {
+      page: 'page',
+      pageSize: 'limit',
+      projectCategoryFilter: 'project_category',
+    },
+  });
+
+  // ===== FILTER MODAL STATE =====
+  const filterModal = useModal();
+
+  // ===== FORMIK SETUP =====
+  const formik = useFormik<ProductionStandardFilterType>({
+    initialValues: {
+      project_category: null,
+    },
+    validationSchema: ProductionStandardFilterSchema,
+    onSubmit: (values, { setSubmitting }) => {
+      updateFilter('projectCategoryFilter', values.project_category || '');
+      filterModal.closeModal();
+      setSubmitting(false);
+    },
+    onReset: () => {
+      updateFilter('projectCategoryFilter', '');
+    },
+  });
+
+  // ===== PROJECT CATEGORY OPTIONS (GROWING or LAYING) =====
+  const projectCategoryOptions = useMemo(
+    () => [
+      { value: 'GROWING', label: 'Growing' },
+      { value: 'LAYING', label: 'Laying' },
+    ],
+    []
+  );
+
+  // ===== FILTER HANDLERS =====
+  const handleFilterProjectCategoryChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const option = val as OptionType | null;
+      const category = option?.value ? String(option.value) : null;
+
+      formik.setFieldValue('project_category', category);
+    },
+    [formik]
+  );
+
+  // ===== FILTER HELPERS =====
+  const projectCategoryValue = useMemo(() => {
+    if (!formik.values.project_category) return null;
+    return (
+      projectCategoryOptions.find(
+        (opt) => opt.value === formik.values.project_category
+      ) || null
+    );
+  }, [formik.values.project_category, projectCategoryOptions]);
+
+  // ===== HANDLE FILTER MODAL OPEN =====
+  const handleFilterModalOpen = () => {
+    filterModal.openModal();
+    formik.validateForm();
+  };
+
+  useEffect(() => {
+    setTableState('production-standard-table', pathname);
+  }, [pathname, setTableState]);
+
+  const [sorting, setSorting] = useState<SortingState>([]);
+
+  const {
+    data: productionStandards,
+    isLoading,
+    mutate: refreshProductionStandards,
+  } = useSWR(
+    `${ProductionStandardApi.basePath}${getTableFilterQueryString()}`,
+    ProductionStandardApi.getAllFetcher
+  );
+
+  const deleteModal = useModal();
   const [selectedProductionStandard, setSelectedProductionStandard] = useState<
     ProductionStandard | undefined
   >(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
-  const { data: productionStandards, mutate: refreshProductionStandards } =
-    useSWR(
-      `${ProductionStandardApi.basePath}`,
-      ProductionStandardApi.getAllFetcher
-    );
-
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
@@ -107,51 +226,33 @@ const ProductionStandardTable = () => {
     setIsDeleteLoading(false);
   };
 
-  return (
+  const productionStandardColumns: ColumnDef<ProductionStandard>[] = useMemo(
-    <>
+    () => [
-      <div className='flex flex-col gap-6 p-6'>
-        <div className='flex flex-row gap-6 justify-start'>
-          <RequirePermission permissions='lti.master.production_standards.create'>
-            <Button
-              href='/master-data/production-standard/add'
-              variant='outline'
-            >
-              <Icon icon='mdi:plus' /> Tambah
-            </Button>
-          </RequirePermission>
-        </div>
-        <RequirePermission permissions='lti.master.production_standards.list'>
-          <Table<ProductionStandard>
-            data={
-              isResponseSuccess(productionStandards)
-                ? productionStandards.data
-                : []
-            }
-            columns={[
       {
         header: 'No',
-                accessorFn: (row, index) => index + 1,
+        cell: (props) =>
+          tableFilterState.pageSize * (tableFilterState.page - 1) +
+          props.row.index +
+          1,
       },
       {
-                header: 'Nama',
         accessorKey: 'name',
+        header: 'Nama',
       },
       {
+        accessorFn: (row) => row.project_category ?? '-',
         header: 'Kategori',
-                accessorFn: (row) => row.project_category,
       },
       {
         header: 'Aksi',
-                cell: (props) => {
+        cell: (props: CellContext<ProductionStandard, unknown>) => {
           const currentPageSize =
             props.table.getPaginationRowModel().rows.length;
-                  const currentPageRows =
+          const currentPageRows = props.table.getPaginationRowModel().flatRows;
-                    props.table.getPaginationRowModel().flatRows;
           const currentRowRelativeIndex =
             currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-                  const isLast2Rows =
+          const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-                    currentRowRelativeIndex > currentPageSize - 2;
 
           const deleteClickHandler = () => {
             setSelectedProductionStandard(props.row.original);
@@ -159,45 +260,90 @@ const ProductionStandardTable = () => {
           };
 
           return (
-                    <>
-                      {currentPageSize > 2 && (
-                        <RowDropdownOptions isLast2Rows={isLast2Rows}>
             <RowOptionsMenu
-                            type='dropdown'
               props={props}
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
               deleteClickHandler={deleteClickHandler}
             />
-                        </RowDropdownOptions>
-                      )}
-
-                      {currentPageSize <= 2 && (
-                        <RowCollapseOptions>
-                          <RowOptionsMenu
-                            type='collapse'
-                            props={props}
-                            deleteClickHandler={deleteClickHandler}
-                          />
-                        </RowCollapseOptions>
-                      )}
-                    </>
           );
         },
       },
-            ]}
+    ],
-            className={{
+    [tableFilterState.pageSize, tableFilterState.page, deleteModal]
-              headerColumnClassName: cn(
+  );
-                TABLE_DEFAULT_STYLING.headerColumnClassName,
+
-                'last:flex last:flex-row last:justify-end'
+  return (
-              ),
+    <>
-              bodyColumnClassName: cn(
+      <div className='w-full'>
-                TABLE_DEFAULT_STYLING.bodyColumnClassName,
+        {/* Header Section */}
-                'last:flex last:flex-row last:justify-end'
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-              ),
+          {/* Action Buttons */}
-            }}
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
-          />
+            <RequirePermission permissions='lti.master.production_standards.create'>
+              <Button
+                href='/master-data/production-standard/add'
+                color='primary'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
+              >
+                <Icon icon='heroicons:plus' width={20} height={20} />
+                Add Standard Production
+              </Button>
             </RequirePermission>
           </div>
-      <RequirePermission permissions='lti.master.production_standards.delete'>
+
+          {/* Filter */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
+            <ButtonFilter
+              values={tableFilterState}
+              excludeFields={['page', 'pageSize']}
+              onClick={handleFilterModalOpen}
+              className='px-3 py-2.5'
+            />
+          </div>
+        </div>
+
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(productionStandards) ||
+            productionStandards.data?.length === 0 ? (
+            <div className='p-3'>
+              <ProductionStandardTableSkeleton
+                columns={productionStandardColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
+            <Table<ProductionStandard>
+              data={productionStandards.data}
+              columns={productionStandardColumns}
+              pageSize={tableFilterState.pageSize}
+              page={productionStandards?.meta?.page ?? 0}
+              totalItems={productionStandards?.meta?.total_results ?? 0}
+              onPageChange={setPage}
+              onPageSizeChange={setPageSize}
+              isLoading={false}
+              sorting={sorting}
+              setSorting={setSorting}
+              className={{
+                containerClassName: 'p-3 mb-0',
+                headerColumnClassName: 'text-nowrap',
+              }}
+            />
+          )}
+        </div>
+      </div>
+
       <ConfirmationModal
         ref={deleteModal.ref}
         type='error'
@@ -212,7 +358,65 @@ const ProductionStandardTable = () => {
           onClick: confirmationModalDeleteClickHandler,
         }}
       />
-      </RequirePermission>
+
+      {/* Filter Modal */}
+      <Modal
+        ref={filterModal.ref}
+        className={{
+          modal: 'p-0',
+          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
+        }}
+      >
+        {/* Modal Header */}
+        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
+          <div className='flex items-center gap-2 text-primary'>
+            <Icon icon='heroicons:funnel' width={20} height={20} />
+            <h3 className='font-medium text-sm'>Filter Data</h3>
+          </div>
+          <Button
+            variant='link'
+            onClick={filterModal.closeModal}
+            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
+          >
+            <Icon icon='heroicons:x-mark' width={20} height={20} />
+          </Button>
+        </div>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
+          <div className='p-4 flex flex-col gap-1.5'>
+            <SelectInputRadio
+              label='Kategori'
+              placeholder='Pilih Kategori'
+              options={projectCategoryOptions}
+              value={projectCategoryValue}
+              onChange={handleFilterProjectCategoryChange}
+              isClearable
+              className={{ wrapper: 'w-full' }}
+            />
+          </div>
+
+          {/* Modal Footer */}
+          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
+            <Button
+              type='button'
+              variant='soft'
+              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
+              onClick={() => {
+                formik.resetForm();
+                filterModal.closeModal();
+              }}
+            >
+              Reset Filter
+            </Button>
+            <Button
+              type='submit'
+              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
+              disabled={!formik.isValid || formik.isSubmitting}
+            >
+              Apply Filter
+            </Button>
+          </div>
+        </form>
+      </Modal>
     </>
   );
 };

src/components/pages/master-data/production-standard/filter/ProductionStandardFilter.ts

@@ -0,0 +1,9 @@
+import { string, object } from 'yup';
+
+export const ProductionStandardFilterSchema = object().shape({
+  project_category: string().nullable(),
+});
+
+export type ProductionStandardFilterType = {
+  project_category: string | null;
+};

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

@@ -178,14 +178,7 @@ const ProductionStandardForm = ({
   const router = useRouter();
 
   // ===== Store =====
-  const {
+  const { formData, setFormData, clearCache } = useFormStore();
-    formData,
-    setFormData,
-    addDetail,
-    updateDetail,
-    deleteDetail,
-    clearCache,
-  } = useFormStore();
 
   // ===== Formik =====
   // Initial values - only recalculate when initialValue changes (for edit/detail mode)

src/components/pages/master-data/production-standard/skeleton/ProductionStandardTableSkeleton.tsx

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

src/components/pages/master-data/supplier/SupplierTable.tsx

@@ -1,51 +1,86 @@
 'use client';
 
-import Button from '@/components/Button';
+import {
-import DebouncedTextInput from '@/components/input/DebouncedTextInput';
+  ChangeEventHandler,
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
+  useCallback,
-import { useModal } from '@/components/Modal';
+  useEffect,
-import ConfirmationModal from '@/components/modal/ConfirmationModal';
+  useMemo,
-import Table from '@/components/Table';
+  useState,
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
+} from 'react';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
+import { usePathname } from 'next/navigation';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
-import RequirePermission from '@/components/helper/RequirePermission';
-import { ROWS_OPTIONS } from '@/config/constant';
-import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { cn } from '@/lib/helper';
-import { SupplierApi } from '@/services/api/master-data';
-import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { Supplier } from '@/types/api/master-data/supplier';
-import { Icon } from '@iconify/react';
-import { CellContext, ColumnDef } from '@tanstack/react-table';
-import { useState } from 'react';
-import toast from 'react-hot-toast';
 import useSWR from 'swr';
+import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
+import toast from 'react-hot-toast';
+import { useFormik } from 'formik';
 
-const RowOptions = ({
+import { Icon } from '@iconify/react';
-  type = 'dropdown',
+import Table from '@/components/Table';
+import DebouncedTextInput from '@/components/input/DebouncedTextInput';
+import Button from '@/components/Button';
+import Modal, { useModal } from '@/components/Modal';
+import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import RequirePermission from '@/components/helper/RequirePermission';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
+import SupplierTableSkeleton from '@/components/pages/master-data/supplier/skeleton/SupplierTableSkeleton';
+import { OptionType } from '@/components/input/SelectInput';
+import ButtonFilter from '@/components/helper/ButtonFilter';
+
+import { Supplier } from '@/types/api/master-data/supplier';
+import { SupplierApi } from '@/services/api/master-data';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { useTableFilter } from '@/services/hooks/useTableFilter';
+import { useUiStore } from '@/stores/ui/ui.store';
+import {
+  SupplierFilterSchema,
+  SupplierFilterType,
+} from '@/components/pages/master-data/supplier/filter/SupplierFilter';
+import SelectInputRadio from '@/components/input/SelectInputRadio';
+
+const RowOptionsMenu = ({
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Supplier, unknown>;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `supplier#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-supplier#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.master.suppliers.detail'>
             <Button
               href={`/master-data/supplier/detail/?supplierId=${props.row.original.id}`}
               variant='ghost'
-          color='primary'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon
+              <Icon icon='heroicons:eye' width={20} height={20} />
-            icon='mdi:eye-outline'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Detail
             </Button>
           </RequirePermission>
@@ -53,39 +88,38 @@ const RowOptions = ({
             <Button
               href={`/master-data/supplier/detail/edit/?supplierId=${props.row.original.id}`}
               variant='ghost'
-          color='warning'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon
+              <Icon icon='heroicons:pencil-square' width={20} height={20} />
-            icon='material-symbols:edit-outline'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Edit
             </Button>
           </RequirePermission>
           <RequirePermission permissions='lti.master.suppliers.delete'>
             <Button
-          onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
-          color='error'
+              color='none'
-          className='justify-start text-sm text-error focus-visible:text-error-content hover:text-error-content'
+              className='p-3 justify-start text-sm font-semibold w-full text-error hover:text-error'
             >
-          <Icon
+              <Icon icon='heroicons:trash' width={20} height={20} />
-            icon='material-symbols:delete-outline-rounded'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Delete
             </Button>
           </RequirePermission>
-    </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
 const SuppliersTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -93,15 +127,132 @@ const SuppliersTable = () => {
     setPageSize,
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
-    initial: { search: '', nameSort: '' },
+    initial: {
+      search: '',
+      categoryFilter: '',
+      flagFilter: '',
+    },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
-      nameSort: 'sort_name',
+      categoryFilter: 'category_id',
+      flagFilter: 'flag',
     },
   });
 
-  // Fetch Data
+  // ===== FILTER MODAL STATE =====
+  const filterModal = useModal();
+
+  // ===== FORMIK SETUP =====
+  const formik = useFormik<SupplierFilterType>({
+    initialValues: {
+      category_id: null,
+      flag: false,
+    },
+    validationSchema: SupplierFilterSchema,
+    onSubmit: (values, { setSubmitting }) => {
+      updateFilter('categoryFilter', values.category_id || '');
+      updateFilter(
+        'flagFilter',
+        values.flag === true ? 'EKSPEDISI' : values.flag === false ? '' : ''
+      );
+      filterModal.closeModal();
+      setSubmitting(false);
+    },
+    onReset: () => {
+      updateFilter('categoryFilter', '');
+      updateFilter('flagFilter', '');
+      formik.setFieldValue('flag', false);
+    },
+  });
+
+  const { setFieldValue } = formik;
+
+  // ===== CATEGORY OPTIONS (SAPRONAK or BOP) =====
+  const categoryOptions = useMemo(
+    () => [
+      { value: 'SAPRONAK', label: 'SAPRONAK' },
+      { value: 'BOP', label: 'BOP' },
+    ],
+    []
+  );
+
+  // ===== FLAG OPTIONS (EKSPEDISI) =====
+  const flagOptions = useMemo(
+    () => [
+      { value: 'true', label: 'Ya' },
+      { value: 'false', label: 'Tidak' },
+    ],
+    []
+  );
+
+  // ===== FILTER HANDLERS =====
+  const handleFilterCategoryChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const option = val as OptionType | null;
+      const categoryId = option?.value ? String(option.value) : null;
+
+      setFieldValue('category_id', categoryId);
+    },
+    [setFieldValue]
+  );
+
+  const handleFilterFlagChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const option = val as OptionType | null;
+      const boolValue =
+        option?.value === 'true'
+          ? true
+          : option?.value === 'false'
+            ? false
+            : null;
+
+      setFieldValue('flag', boolValue);
+    },
+    [setFieldValue]
+  );
+
+  // ===== FILTER HELPERS =====
+  const categoryIdValue = useMemo(() => {
+    if (!formik.values.category_id) return null;
+    return (
+      categoryOptions.find((opt) => opt.value === formik.values.category_id) ||
+      null
+    );
+  }, [formik.values.category_id, categoryOptions]);
+
+  const flagValue = useMemo(() => {
+    if (formik.values.flag === null) return null;
+    return (
+      flagOptions.find((opt) => opt.value === String(formik.values.flag)) ||
+      flagOptions[1]
+    );
+  }, [formik.values.flag, flagOptions]);
+
+  // ===== HANDLE FILTER MODAL OPEN =====
+  const handleFilterModalOpen = () => {
+    filterModal.openModal();
+    formik.validateForm();
+  };
+
+  useEffect(() => {
+    if (filterModal.open) {
+      const flagBoolValue =
+        tableFilterState.flagFilter === 'EKSPEDISI' ? true : false;
+      setFieldValue('flag', flagBoolValue);
+    }
+  }, [filterModal.open, tableFilterState.flagFilter, setFieldValue]);
+
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('suppliers-table', pathname);
+  }, [pathname, setTableState]);
+
+  const [sorting, setSorting] = useState<SortingState>([]);
+
   const {
     data: suppliers,
     isLoading,
@@ -111,17 +262,41 @@ const SuppliersTable = () => {
     SupplierApi.getAllFetcher
   );
 
-  // State
   const deleteModal = useModal();
   const [selectedSupplier, setSelectedSupplier] = useState<
     Supplier | undefined
   >(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
-  // Columns Definition
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-  const suppliersColumns: ColumnDef<Supplier>[] = [
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
+  };
+
+  const confirmationModalDeleteClickHandler = async () => {
+    setIsDeleteLoading(true);
+
+    const deleteResponse = await SupplierApi.delete(
+      selectedSupplier?.id as number
+    );
+
+    if (isResponseError(deleteResponse)) {
+      toast.error(deleteResponse.message);
+      setIsDeleteLoading(false);
+      return;
+    }
+
+    refreshSuppliers();
+
+    deleteModal.closeModal();
+    toast.success('Successfully delete Supplier!');
+    setIsDeleteLoading(false);
+  };
+
+  const suppliersColumns: ColumnDef<Supplier>[] = useMemo(
+    () => [
       {
-      header: '#',
+        header: 'No',
         cell: (props) =>
           tableFilterState.pageSize * (tableFilterState.page - 1) +
           props.row.index +
@@ -161,8 +336,9 @@ const SuppliersTable = () => {
       },
       {
         header: 'Aksi',
-      cell: (props) => {
+        cell: (props: CellContext<Supplier, unknown>) => {
-        const currentPageSize = props.table.getPaginationRowModel().rows.length;
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
           const currentPageRows = props.table.getPaginationRowModel().flatRows;
           const currentRowRelativeIndex =
             currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
@@ -175,128 +351,109 @@ const SuppliersTable = () => {
           };
 
           return (
-          <>
+            <RowOptionsMenu
-            {currentPageSize > 2 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                <RowOptions
-                  type='dropdown'
               props={props}
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
               deleteClickHandler={deleteClickHandler}
             />
-              </RowDropdownOptions>
-            )}
-
-            {currentPageSize <= 2 && (
-              <RowCollapseOptions>
-                <RowOptions
-                  type='collapse'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowCollapseOptions>
-            )}
-          </>
           );
         },
       },
-  ];
+    ],
-
+    [tableFilterState.pageSize, tableFilterState.page, deleteModal]
-  // Handler
-  const confirmationModalDeleteClickHandler = async () => {
-    setIsDeleteLoading(true);
-
-    const deleteResponse = await SupplierApi.delete(
-      selectedSupplier?.id as number
   );
 
-    if (isResponseError(deleteResponse)) {
-      toast.error(deleteResponse.message);
-      setIsDeleteLoading(false);
-      return;
-    }
-
-    refreshSuppliers();
-
-    deleteModal.closeModal();
-    toast.success('Successfully delete Supplier!');
-    setIsDeleteLoading(false);
-  };
-  const searchChangeHandler = (e: React.ChangeEvent<HTMLInputElement>) => {
-    updateFilter('search', e.target.value);
-  };
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
-    const newVal = val as OptionType;
-    setPageSize(newVal.value as number);
-  };
-
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row'>
+          {/* Action Buttons */}
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.master.suppliers.create'>
               <Button
                 href='/master-data/supplier/add'
-                  variant='outline'
                 color='primary'
-                  className='w-full sm:w-fit'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-                  <Icon icon='ic:round-plus' width={24} height={24} />
+                <Icon icon='heroicons:plus' width={20} height={20} />
-                  Tambah
+                Add Supplier
               </Button>
             </RequirePermission>
           </div>
 
+          {/* Search and Filter */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-              placeholder='Cari Supplier'
+              placeholder='Search'
-              value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
                 />
-          </div>
+              }
-
+              className={{
-          <div className='flex flex-row justify-end'>
+                wrapper: 'w-full min-w-24 max-w-3xs',
-            <SelectInput
+                inputWrapper: 'rounded-xl! shadow-button-soft',
-              label='Baris'
+                input:
-              options={ROWS_OPTIONS}
+                  'placeholder:font-semibold placeholder:text-base-content/50',
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
               }}
-              onChange={pageSizeChangeHandler}
+            />
-              className={{ wrapper: 'max-w-28' }}
+
+            <ButtonFilter
+              values={tableFilterState}
+              excludeFields={['page', 'pageSize', 'search']}
+              onClick={handleFilterModalOpen}
+              className='px-3 py-2.5'
             />
           </div>
         </div>
 
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(suppliers) || suppliers.data?.length === 0 ? (
+            <div className='p-3'>
+              <SupplierTableSkeleton
+                columns={suppliersColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<Supplier>
-          data={isResponseSuccess(suppliers) ? suppliers?.data : []}
+              data={suppliers?.data}
               columns={suppliersColumns}
               pageSize={tableFilterState.pageSize}
-          page={isResponseSuccess(suppliers) ? suppliers?.meta?.page : 0}
+              page={suppliers?.meta?.page ?? 0}
-          totalItems={
+              totalItems={suppliers?.meta?.total_results ?? 0}
-            isResponseSuccess(suppliers) ? suppliers?.meta?.total_results : 0
-          }
               onPageChange={setPage}
-          isLoading={isLoading}
+              onPageSizeChange={setPageSize}
+              isLoading={false}
+              sorting={sorting}
+              setSorting={setSorting}
               className={{
-            containerClassName: cn({
+                containerClassName: 'p-3 mb-0',
-              'mb-20':
+                headerColumnClassName: 'text-nowrap',
-                isResponseSuccess(suppliers) && suppliers?.data?.length === 0,
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
         </div>
+      </div>
+
       <ConfirmationModal
         ref={deleteModal.ref}
         type='error'
@@ -311,6 +468,75 @@ const SuppliersTable = () => {
           onClick: confirmationModalDeleteClickHandler,
         }}
       />
+
+      {/* Filter Modal */}
+      <Modal
+        ref={filterModal.ref}
+        className={{
+          modal: 'p-0',
+          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
+        }}
+      >
+        {/* Modal Header */}
+        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
+          <div className='flex items-center gap-2 text-primary'>
+            <Icon icon='heroicons:funnel' width={20} height={20} />
+            <h3 className='font-medium text-sm'>Filter Data</h3>
+          </div>
+          <Button
+            variant='link'
+            onClick={filterModal.closeModal}
+            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
+          >
+            <Icon icon='heroicons:x-mark' width={20} height={20} />
+          </Button>
+        </div>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
+          <div className='p-4 flex flex-col gap-1.5'>
+            <SelectInputRadio
+              label='Kategori'
+              placeholder='Pilih Kategori'
+              options={categoryOptions}
+              value={categoryIdValue}
+              onChange={handleFilterCategoryChange}
+              isClearable
+              className={{ wrapper: 'w-full' }}
+            />
+
+            <SelectInputRadio
+              label='Flag Ekspedisi'
+              placeholder='Pilih'
+              options={flagOptions}
+              value={flagValue}
+              onChange={handleFilterFlagChange}
+              isClearable
+              className={{ wrapper: 'w-full' }}
+            />
+          </div>
+
+          {/* Modal Footer */}
+          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
+            <Button
+              type='button'
+              variant='soft'
+              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
+              onClick={() => {
+                formik.resetForm();
+                filterModal.closeModal();
+              }}
+            >
+              Reset Filter
+            </Button>
+            <Button
+              type='submit'
+              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
+              disabled={!formik.isValid || formik.isSubmitting}
+            >
+              Apply Filter
+            </Button>
+          </div>
+        </form>
+      </Modal>
     </>
   );
 };

src/components/pages/master-data/supplier/filter/SupplierFilter.ts

@@ -0,0 +1,11 @@
+import { string, boolean, object } from 'yup';
+
+export const SupplierFilterSchema = object().shape({
+  category_id: string().nullable(),
+  flag: boolean().nullable(),
+});
+
+export type SupplierFilterType = {
+  category_id: string | null;
+  flag: boolean | null;
+};

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

@@ -167,29 +167,26 @@ const SupplierForm = ({
     },
   });
 
-  const { setValues: formikSetValues } = formik;
+  const { setFieldValue } = formik;
 
   // Initialize Formik
   useEffect(() => {
-    formikSetValues(formikInitialValues);
+    if (formType !== 'add' && initialValues?.hatchery) {
-    if (formType != 'add') {
+      const hatcheryArrays = initialValues.hatchery.split(',');
-      const hatcheryArrays = formikInitialValues.hatchery?.split(',');
+      const hatcheryCreatedOptions = hatcheryArrays.map((item) => ({
-      const hatcheryCreatedOptions = hatcheryArrays?.map((item) => ({
         value: item,
         label: item,
       }));
-      setHatcheryOptionValues(hatcheryCreatedOptions ?? []);
+      setHatcheryOptionValues(hatcheryCreatedOptions);
     }
-  }, [formikSetValues, formikInitialValues, setHatcheryOptionValues]);
+  }, [formType, initialValues?.hatchery]);
+
   useEffect(() => {
     const commaSeparatedValues = hatcheryOptionsValues
       .map((item) => item.value)
       .join(',');
-    formikSetValues({
+    setFieldValue('hatchery', commaSeparatedValues);
-      ...formik.values,
+  }, [hatcheryOptionsValues, setFieldValue]);
-      hatchery: commaSeparatedValues,
-    });
-  }, [hatcheryOptionsValues, formikSetValues]);
 
   // Option Handler
   const typeChangeHandler = (val: OptionType | OptionType[] | null) => {

src/components/pages/master-data/supplier/skeleton/SupplierTableSkeleton.tsx

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

src/components/pages/master-data/uom/UomsTable.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { ChangeEventHandler, useEffect, useState } from 'react';
+import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
 import useSWR from 'swr';
 import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 import toast from 'react-hot-toast';
@@ -11,75 +11,101 @@ import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import Button from '@/components/Button';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RequirePermission from '@/components/helper/RequirePermission';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
+import UomTableSkeleton from '@/components/pages/master-data/uom/skeleton/UomTableSkeleton';
 
 import { Uom } from '@/types/api/master-data/uom';
 import { UomApi } from '@/services/api/master-data';
-import { cn } from '@/lib/helper';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { ROWS_OPTIONS } from '@/config/constant';
+import { usePathname } from 'next/navigation';
+import { useUiStore } from '@/stores/ui/ui.store';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Uom, unknown>;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `uom#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-uom#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.master.uoms.detail'>
             <Button
               href={`/master-data/uom/detail/?uomId=${props.row.original.id}`}
               variant='ghost'
-          color='primary'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.uoms.update'>
             <Button
               href={`/master-data/uom/detail/edit/?uomId=${props.row.original.id}`}
               variant='ghost'
-          color='warning'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+              <Icon icon='heroicons:pencil-square' width={20} height={20} />
               Edit
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.uoms.delete'>
             <Button
-          onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
-          color='error'
+              color='none'
-          className='justify-start text-sm text-error focus-visible:text-error-content hover:text-error-content'
+              className='p-3 justify-start text-sm font-semibold w-full text-error hover:text-error'
             >
-          <Icon
+              <Icon icon='heroicons:trash' width={20} height={20} />
-            icon='material-symbols:delete-outline-rounded'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Delete
             </Button>
           </RequirePermission>
-    </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
 const UomsTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -87,10 +113,25 @@ const UomsTable = () => {
     setPageSize,
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
-    initial: { search: '', nameSort: '' },
+    initial: {
-    paramMap: { page: 'page', pageSize: 'limit', nameSort: 'sort_name' },
+      search: searchValue,
+    },
+    paramMap: {
+      page: 'page',
+      pageSize: 'limit',
+    },
   });
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('uoms-table', pathname);
+  }, [pathname, setTableState]);
+
+  const [sorting, setSorting] = useState<SortingState>([]);
+
   const {
     data: uoms,
     isLoading,
@@ -101,66 +142,14 @@ const UomsTable = () => {
   );
 
   const deleteModal = useModal();
-
   const [selectedUom, setSelectedUom] = useState<Uom | undefined>(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
-  const [sorting, setSorting] = useState<SortingState>([]);
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-
+    setSearchValue(e.target.value);
-  const uomsColumns: ColumnDef<Uom>[] = [
+    updateFilter('search', e.target.value);
-    {
-      header: '#',
-      cell: (props) =>
-        tableFilterState.pageSize * (tableFilterState.page - 1) +
-        props.row.index +
-        1,
-    },
-    {
-      accessorKey: 'name',
-      header: 'Nama',
-    },
-    {
-      header: 'Aksi',
-      cell: (props) => {
-        const currentPageSize = props.table.getPaginationRowModel().rows.length;
-        const currentPageRows = props.table.getPaginationRowModel().flatRows;
-        const currentRowRelativeIndex =
-          currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
-
-        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-
-        const deleteClickHandler = () => {
-          setSelectedUom(props.row.original);
-          deleteModal.openModal();
   };
 
-        return (
-          <>
-            {currentPageSize > 2 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                <RowOptionsMenu
-                  type='dropdown'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowDropdownOptions>
-            )}
-
-            {currentPageSize <= 2 && (
-              <RowCollapseOptions>
-                <RowOptionsMenu
-                  type='collapse'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowCollapseOptions>
-            )}
-          </>
-        );
-      },
-    },
-  ];
-
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
@@ -179,93 +168,130 @@ const UomsTable = () => {
     setIsDeleteLoading(false);
   };
 
-  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+  const uomsColumns: ColumnDef<Uom>[] = useMemo(
-    updateFilter('search', e.target.value);
+    () => [
+      {
+        header: 'No',
+        cell: (props) =>
+          tableFilterState.pageSize * (tableFilterState.page - 1) +
+          props.row.index +
+          1,
+      },
+      {
+        accessorKey: 'name',
+        header: 'Nama',
+      },
+      {
+        header: 'Aksi',
+        cell: (props: CellContext<Uom, unknown>) => {
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
+          const currentPageRows = props.table.getPaginationRowModel().flatRows;
+          const currentRowRelativeIndex =
+            currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
+
+          const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+
+          const deleteClickHandler = () => {
+            setSelectedUom(props.row.original);
+            deleteModal.openModal();
           };
 
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+          return (
-    const newVal = val as OptionType;
+            <RowOptionsMenu
-
+              props={props}
-    setPageSize(newVal.value as number);
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
-  };
+              deleteClickHandler={deleteClickHandler}
-
+            />
-  // track sorting
+          );
-  useEffect(() => {
+        },
-    const isNameSorted = sorting.find((sortItem) => sortItem.id === 'name');
+      },
-
+    ],
-    if (!isNameSorted) {
+    [tableFilterState.pageSize, tableFilterState.page, deleteModal]
-      updateFilter('nameSort', '');
+  );
-    } else {
-      updateFilter('nameSort', isNameSorted.desc ? 'desc' : 'asc');
-    }
-  }, [sorting, updateFilter]);
 
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row'>
+          {/* Action Buttons */}
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.master.uoms.create'>
               <Button
                 href='/master-data/uom/add'
-                  variant='outline'
                 color='primary'
-                  className='w-full sm:w-fit'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-                  <Icon icon='ic:round-plus' width={24} height={24} />
+                <Icon icon='heroicons:plus' width={20} height={20} />
-                  Tambah
+                Add UOM
               </Button>
             </RequirePermission>
           </div>
 
+          {/* Search */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-              placeholder='Cari UOM'
+              placeholder='Search'
-              value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
                 />
-          </div>
+              }
-
+              className={{
-          <div className='flex flex-row justify-end'>
+                wrapper: 'w-full min-w-24 max-w-3xs',
-            <SelectInput
+                inputWrapper: 'rounded-xl! shadow-button-soft',
-              label='Baris'
+                input:
-              options={ROWS_OPTIONS}
+                  'placeholder:font-semibold placeholder:text-base-content/50',
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
               }}
-              onChange={pageSizeChangeHandler}
-              className={{ wrapper: 'max-w-28' }}
             />
           </div>
         </div>
 
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(uoms) || uoms.data?.length === 0 ? (
+            <div className='p-3'>
+              <UomTableSkeleton
+                columns={uomsColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<Uom>
-          data={isResponseSuccess(uoms) ? uoms?.data : []}
+              data={uoms?.data}
               columns={uomsColumns}
               pageSize={tableFilterState.pageSize}
-          page={isResponseSuccess(uoms) ? uoms?.meta?.page : 0}
+              page={uoms?.meta?.page ?? 0}
-          totalItems={isResponseSuccess(uoms) ? uoms?.meta?.total_results : 0}
+              totalItems={uoms?.meta?.total_results ?? 0}
               onPageChange={setPage}
-          isLoading={isLoading}
+              onPageSizeChange={setPageSize}
+              isLoading={false}
               sorting={sorting}
               setSorting={setSorting}
               className={{
-            containerClassName: cn({
+                containerClassName: 'p-3 mb-0',
-              'mb-20': isResponseSuccess(uoms) && uoms?.data?.length === 0,
+                headerColumnClassName: 'text-nowrap',
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
+        </div>
       </div>
 
       <ConfirmationModal

src/components/pages/master-data/uom/skeleton/UomTableSkeleton.tsx

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

src/components/pages/master-data/warehouse/WarehousesTable.tsx

@@ -1,90 +1,128 @@
 'use client';
 
-import { ChangeEventHandler, useCallback, useEffect, useState } from 'react';
-import useSWR from 'swr';
 import {
-  CellContext,
+  ChangeEventHandler,
-  ColumnDef,
+  useCallback,
-  ColumnSort,
+  useEffect,
-  SortingState,
+  useMemo,
-} from '@tanstack/react-table';
+  useState,
+} from 'react';
+import { usePathname } from 'next/navigation';
+import useSWR from 'swr';
+import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 import toast from 'react-hot-toast';
+import { useFormik } from 'formik';
 
 import { Icon } from '@iconify/react';
 import Table from '@/components/Table';
 import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import Button from '@/components/Button';
-import { useModal } from '@/components/Modal';
+import Modal, { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RequirePermission from '@/components/helper/RequirePermission';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
+import WarehouseTableSkeleton from '@/components/pages/master-data/warehouse/skeleton/WarehouseTableSkeleton';
+
+import { OptionType } from '@/components/input/SelectInput';
+import ButtonFilter from '@/components/helper/ButtonFilter';
 
 import { Warehouse } from '@/types/api/master-data/warehouse';
-import { WarehouseApi } from '@/services/api/master-data';
+import { WarehouseApi, AreaApi } from '@/services/api/master-data';
-import { cn } from '@/lib/helper';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { ROWS_OPTIONS } from '@/config/constant';
+import { useUiStore } from '@/stores/ui/ui.store';
+import {
+  WarehouseFilterSchema,
+  WarehouseFilterType,
+} from '@/components/pages/master-data/warehouse/filter/WarehouseFilter';
+import { Area } from '@/types/api/master-data/area';
+import SelectInput, { useSelect } from '@/components/input/SelectInput';
+import SelectInputRadio from '@/components/input/SelectInputRadio';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
   deleteClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<Warehouse, unknown>;
   deleteClickHandler: () => void;
 }) => {
+  const popoverId = `warehouse#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-warehouse#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
           <RequirePermission permissions='lti.master.warehouses.detail'>
             <Button
               href={`/master-data/warehouse/detail/?warehouseId=${props.row.original.id}`}
               variant='ghost'
-          color='primary'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='mdi:eye-outline' width={16} height={16} />
+              <Icon icon='heroicons:eye' width={20} height={20} />
               Detail
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.warehouses.update'>
             <Button
               href={`/master-data/warehouse/detail/edit/?warehouseId=${props.row.original.id}`}
               variant='ghost'
-          color='warning'
+              color='none'
-          className='justify-start text-sm'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
             >
-          <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+              <Icon icon='heroicons:pencil-square' width={20} height={20} />
               Edit
             </Button>
           </RequirePermission>
-
           <RequirePermission permissions='lti.master.warehouses.delete'>
             <Button
-          onClick={deleteClickHandler}
+              onClick={() => {
+                deleteClickHandler();
+                closePopover();
+              }}
               variant='ghost'
-          color='error'
+              color='none'
-          className='text-error hover:text-inherit'
+              className='p-3 justify-start text-sm font-semibold w-full text-error hover:text-error'
             >
-          <Icon
+              <Icon icon='heroicons:trash' width={20} height={20} />
-            icon='material-symbols:delete-outline-rounded'
-            width={16}
-            height={16}
-            className='justify-start text-sm'
-          />
               Delete
             </Button>
           </RequirePermission>
-    </RowOptionsMenuWrapper>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
 const WarehousesTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -94,23 +132,139 @@ const WarehousesTable = () => {
   } = useTableFilter({
     initial: {
       search: '',
-      nameSort: '',
+      areaFilter: '',
-      typeSort: '',
+      activeProjectFlockFilter: '',
-      areaSort: '',
-      locationSort: '',
-      kandangSort: '',
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
-      nameSort: 'sort_name',
+      areaFilter: 'area_id',
-      typeSort: 'sort_type',
+      activeProjectFlockFilter: 'active_project_flock',
-      areaSort: ' sort_area',
-      locationSort: ' sort_location',
-      kandangSort: ' sort_kandang',
     },
   });
 
+  // ===== FILTER MODAL STATE =====
+  const filterModal = useModal();
+
+  // ===== FORMIK SETUP =====
+  const formik = useFormik<WarehouseFilterType>({
+    initialValues: {
+      area_id: null,
+      active_project_flock: false,
+    },
+    validationSchema: WarehouseFilterSchema,
+    onSubmit: (values, { setSubmitting }) => {
+      updateFilter('areaFilter', values.area_id || '');
+      updateFilter(
+        'activeProjectFlockFilter',
+        values.active_project_flock === true ? 'true' : ''
+      );
+      filterModal.closeModal();
+      setSubmitting(false);
+    },
+    onReset: () => {
+      updateFilter('areaFilter', '');
+      updateFilter('activeProjectFlockFilter', '');
+      formik.setFieldValue('active_project_flock', false);
+    },
+  });
+
+  const { setFieldValue } = formik;
+
+  // ===== AREA OPTIONS =====
+  const {
+    setInputValue: setAreaInputValue,
+    options: areaOptions,
+    isLoadingOptions: isLoadingAreaOptions,
+    loadMore: loadMoreAreas,
+  } = useSelect<Area>(
+    filterModal.open ? AreaApi.basePath : null,
+    'id',
+    'name',
+    'search'
+  );
+
+  // ===== ACTIVE PROJECT FLOCK OPTIONS =====
+  const activeProjectFlockOptions = useMemo(
+    () => [
+      { value: 'true', label: 'Kandang Aktif' },
+      { value: 'false', label: 'Semua Kandang' },
+    ],
+    []
+  );
+
+  // ===== FILTER HANDLERS =====
+  const handleFilterAreaChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const area = val as OptionType | null;
+      const areaId = area?.value ? String(area.value) : null;
+
+      formik.setFieldValue('area_id', areaId);
+    },
+    [formik]
+  );
+
+  const handleFilterActiveProjectFlockChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const option = val as OptionType | null;
+      const boolValue =
+        option?.value === 'true'
+          ? true
+          : option?.value === 'false'
+            ? false
+            : null;
+
+      formik.setFieldValue('active_project_flock', boolValue);
+    },
+    [formik]
+  );
+
+  // ===== FILTER HELPERS =====
+  const areaIdValue = useMemo(() => {
+    if (!formik.values.area_id) return null;
+    return (
+      areaOptions.find((opt) => String(opt.value) === formik.values.area_id) ||
+      null
+    );
+  }, [formik.values.area_id, areaOptions]);
+
+  const activeProjectFlockValue = useMemo(() => {
+    if (formik.values.active_project_flock === null) return null;
+    return (
+      activeProjectFlockOptions.find(
+        (opt) => opt.value === String(formik.values.active_project_flock)
+      ) || activeProjectFlockOptions[1]
+    );
+  }, [formik.values.active_project_flock, activeProjectFlockOptions]);
+
+  // ===== HANDLE FILTER MODAL OPEN =====
+  const handleFilterModalOpen = () => {
+    filterModal.openModal();
+    formik.validateForm();
+  };
+
+  useEffect(() => {
+    if (filterModal.open) {
+      const activeProjectFlockValue =
+        tableFilterState.activeProjectFlockFilter === 'true' ? true : false; // Default ke false (Semua Kandang)
+      setFieldValue('active_project_flock', activeProjectFlockValue);
+    }
+  }, [
+    filterModal.open,
+    tableFilterState.activeProjectFlockFilter,
+    setFieldValue,
+  ]);
+
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('warehouses-table', pathname);
+  }, [pathname, setTableState]);
+
+  const [sorting, setSorting] = useState<SortingState>([]);
+
   const {
     data: warehouses,
     isLoading,
@@ -121,102 +275,16 @@ const WarehousesTable = () => {
   );
 
   const deleteModal = useModal();
-
   const [selectedWarehouse, setSelectedWarehouse] = useState<
     Warehouse | undefined
   >(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
-  const [sorting, setSorting] = useState<SortingState>([]);
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-
+    setSearchValue(e.target.value);
-  const warehousesColumns: ColumnDef<Warehouse>[] = [
+    updateFilter('search', e.target.value);
-    {
-      header: '#',
-      cell: (props) =>
-        tableFilterState.pageSize * (tableFilterState.page - 1) +
-        props.row.index +
-        1,
-    },
-    {
-      accessorKey: 'name',
-      header: 'Nama',
-    },
-    {
-      accessorKey: 'type',
-      header: 'Tipe',
-    },
-    {
-      accessorKey: 'area',
-      header: 'Area',
-      cell: (props) => props.row.original.area.name,
-    },
-    {
-      accessorKey: 'location',
-      header: 'Lokasi',
-      cell: (props) => {
-        if (
-          props.row.original.type === 'LOKASI' ||
-          props.row.original.type === 'KANDANG'
-        ) {
-          return props.row.original.location.name;
-        } else {
-          return '-';
-        }
-      },
-    },
-    {
-      accessorKey: 'kandang',
-      header: 'Kandang',
-      cell: (props) => {
-        if (props.row.original.type === 'KANDANG') {
-          return props.row.original.kandang.name;
-        } else {
-          return '-';
-        }
-      },
-    },
-    {
-      header: 'Aksi',
-      cell: (props) => {
-        const currentPageSize = props.table.getPaginationRowModel().rows.length;
-        const currentPageRows = props.table.getPaginationRowModel().flatRows;
-        const currentRowRelativeIndex =
-          currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
-
-        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-
-        const deleteClickHandler = () => {
-          setSelectedWarehouse(props.row.original);
-          deleteModal.openModal();
   };
 
-        return (
-          <>
-            {currentPageSize > 2 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                <RowOptionsMenu
-                  type='dropdown'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowDropdownOptions>
-            )}
-
-            {currentPageSize <= 2 && (
-              <RowCollapseOptions>
-                <RowOptionsMenu
-                  type='collapse'
-                  props={props}
-                  deleteClickHandler={deleteClickHandler}
-                />
-              </RowCollapseOptions>
-            )}
-          </>
-        );
-      },
-    },
-  ];
-
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
@@ -237,118 +305,169 @@ const WarehousesTable = () => {
     setIsDeleteLoading(false);
   };
 
-  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+  const warehousesColumns: ColumnDef<Warehouse>[] = useMemo(
-    updateFilter('search', e.target.value);
+    () => [
-  };
+      {
-
+        header: 'No',
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+        cell: (props) =>
-    const newVal = val as OptionType;
+          tableFilterState.pageSize * (tableFilterState.page - 1) +
-
+          props.row.index +
-    setPageSize(newVal.value as number);
+          1,
-  };
-
-  const updateSortingFilter = useCallback(
-    (
-      sortName: Exclude<keyof typeof tableFilterState, 'page' | 'pageSize'>,
-      sortFilter: ColumnSort | undefined
-    ) => {
-      if (!sortFilter) {
-        updateFilter(sortName, '');
-      } else {
-        updateFilter(sortName, sortFilter.desc ? 'desc' : 'asc');
-      }
       },
-    [updateFilter]
+      {
-  );
+        accessorKey: 'name',
+        header: 'Nama',
+      },
+      {
+        accessorKey: 'type',
+        header: 'Tipe',
+      },
+      {
+        accessorFn: (row) => row.area?.name ?? '-',
+        header: 'Area',
+      },
+      {
+        accessorKey: 'location',
+        header: 'Lokasi',
+        cell: (props) => {
+          if (
+            props.row.original.type === 'LOKASI' ||
+            props.row.original.type === 'KANDANG'
+          ) {
+            return props.row.original.location?.name ?? '-';
+          }
+          return '-';
+        },
+      },
+      {
+        accessorKey: 'kandang',
+        header: 'Kandang',
+        cell: (props) => {
+          if (props.row.original.type === 'KANDANG') {
+            return props.row.original.kandang?.name ?? '-';
+          }
+          return '-';
+        },
+      },
+      {
+        header: 'Aksi',
+        cell: (props: CellContext<Warehouse, unknown>) => {
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
+          const currentPageRows = props.table.getPaginationRowModel().flatRows;
+          const currentRowRelativeIndex =
+            currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-  // track sorting
+          const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-  useEffect(() => {
-    const nameSortFilter = sorting.find((sortItem) => sortItem.id === 'name');
-    const typeSortFilter = sorting.find((sortItem) => sortItem.id === 'type');
-    const areaSortFilter = sorting.find((sortItem) => sortItem.id === 'area');
-    const locationSortFilter = sorting.find(
-      (sortItem) => sortItem.id === 'location'
-    );
-    const kandangSortFilter = sorting.find(
-      (sortItem) => sortItem.id === 'kandang'
-    );
 
-    updateSortingFilter('nameSort', nameSortFilter);
+          const deleteClickHandler = () => {
-    updateSortingFilter('typeSort', typeSortFilter);
+            setSelectedWarehouse(props.row.original);
-    updateSortingFilter('areaSort', areaSortFilter);
+            deleteModal.openModal();
-    updateSortingFilter('locationSort', locationSortFilter);
+          };
-    updateSortingFilter('kandangSort', kandangSortFilter);
+
-  }, [sorting, updateSortingFilter]);
+          return (
+            <RowOptionsMenu
+              props={props}
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
+              deleteClickHandler={deleteClickHandler}
+            />
+          );
+        },
+      },
+    ],
+    [tableFilterState.pageSize, tableFilterState.page, deleteModal]
+  );
 
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full'>
-        <div className='flex flex-col gap-2 mb-4'>
+        {/* Header Section */}
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+        <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
-            <div className='w-full flex flex-row'>
+          {/* Action Buttons */}
+          <div className='w-fit flex flex-row gap-3 flex-wrap'>
             <RequirePermission permissions='lti.master.warehouses.create'>
               <Button
                 href='/master-data/warehouse/add'
-                  variant='outline'
                 color='primary'
-                  className='w-full sm:w-fit'
+                className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
               >
-                  <Icon icon='ic:round-plus' width={24} height={24} />
+                <Icon icon='heroicons:plus' width={20} height={20} />
-                  Tambah
+                Add Warehouse
               </Button>
             </RequirePermission>
           </div>
 
+          {/* Search and Filter */}
+          <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
             <DebouncedTextInput
               name='search'
-              placeholder='Cari Warehouse'
+              placeholder='Search'
-              value={tableFilterState.search}
+              value={tableFilterState.search ?? ''}
               onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
+              startAdornment={
+                <Icon
+                  icon='heroicons:magnifying-glass'
+                  width={20}
+                  height={20}
                 />
-          </div>
+              }
-
+              className={{
-          <div className='flex flex-row justify-end'>
+                wrapper: 'w-full min-w-24 max-w-3xs',
-            <SelectInput
+                inputWrapper: 'rounded-xl! shadow-button-soft',
-              label='Baris'
+                input:
-              options={ROWS_OPTIONS}
+                  'placeholder:font-semibold placeholder:text-base-content/50',
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
               }}
-              onChange={pageSizeChangeHandler}
+            />
-              className={{ wrapper: 'max-w-28' }}
+
+            <ButtonFilter
+              values={tableFilterState}
+              excludeFields={['page', 'pageSize', 'search']}
+              onClick={handleFilterModalOpen}
+              className='px-3 py-2.5'
             />
           </div>
         </div>
 
+        {/* Table Section */}
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(warehouses) ||
+            warehouses.data?.length === 0 ? (
+            <div className='p-3'>
+              <WarehouseTableSkeleton
+                columns={warehousesColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
             <Table<Warehouse>
-          data={isResponseSuccess(warehouses) ? warehouses?.data : []}
+              data={warehouses?.data}
               columns={warehousesColumns}
               pageSize={tableFilterState.pageSize}
-          page={isResponseSuccess(warehouses) ? warehouses?.meta?.page : 0}
+              page={warehouses?.meta?.page ?? 0}
-          totalItems={
+              totalItems={warehouses?.meta?.total_results ?? 0}
-            isResponseSuccess(warehouses) ? warehouses?.meta?.total_results : 0
-          }
               onPageChange={setPage}
-          isLoading={isLoading}
+              onPageSizeChange={setPageSize}
+              isLoading={false}
               sorting={sorting}
               setSorting={setSorting}
               className={{
-            containerClassName: cn({
+                containerClassName: 'p-3 mb-0',
-              'mb-20':
+                headerColumnClassName: 'text-nowrap',
-                isResponseSuccess(warehouses) && warehouses?.data?.length === 0,
-            }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
               }}
             />
+          )}
+        </div>
       </div>
 
       <ConfirmationModal
@@ -365,6 +484,77 @@ const WarehousesTable = () => {
           onClick: confirmationModalDeleteClickHandler,
         }}
       />
+
+      {/* Filter Modal */}
+      <Modal
+        ref={filterModal.ref}
+        className={{
+          modal: 'p-0',
+          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
+        }}
+      >
+        {/* Modal Header */}
+        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
+          <div className='flex items-center gap-2 text-primary'>
+            <Icon icon='heroicons:funnel' width={20} height={20} />
+            <h3 className='font-medium text-sm'>Filter Data</h3>
+          </div>
+          <Button
+            variant='link'
+            onClick={filterModal.closeModal}
+            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
+          >
+            <Icon icon='heroicons:x-mark' width={20} height={20} />
+          </Button>
+        </div>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
+          <div className='p-4 flex flex-col gap-1.5'>
+            <SelectInput
+              label='Area'
+              placeholder='Pilih Area'
+              options={areaOptions}
+              value={areaIdValue}
+              onChange={handleFilterAreaChange}
+              onInputChange={setAreaInputValue}
+              isLoading={isLoadingAreaOptions}
+              isClearable
+              onMenuScrollToBottom={loadMoreAreas}
+              className={{ wrapper: 'w-full' }}
+            />
+
+            <SelectInputRadio
+              label='Filter Berdasarkan'
+              placeholder='Pilih'
+              options={activeProjectFlockOptions}
+              value={activeProjectFlockValue}
+              onChange={handleFilterActiveProjectFlockChange}
+              className={{ wrapper: 'w-full' }}
+            />
+          </div>
+
+          {/* Modal Footer */}
+          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
+            <Button
+              type='button'
+              variant='soft'
+              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
+              onClick={() => {
+                formik.resetForm();
+                filterModal.closeModal();
+              }}
+            >
+              Reset Filter
+            </Button>
+            <Button
+              type='submit'
+              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
+              disabled={!formik.isValid || formik.isSubmitting}
+            >
+              Apply Filter
+            </Button>
+          </div>
+        </form>
+      </Modal>
     </>
   );
 };

src/components/pages/master-data/warehouse/filter/WarehouseFilter.ts

@@ -0,0 +1,11 @@
+import { string, boolean, object } from 'yup';
+
+export const WarehouseFilterSchema = object().shape({
+  area_id: string().nullable(),
+  active_project_flock: boolean().nullable(),
+});
+
+export type WarehouseFilterType = {
+  area_id: string | null;
+  active_project_flock: boolean | null;
+};

src/components/pages/master-data/warehouse/skeleton/WarehouseTableSkeleton.tsx

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

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

@@ -23,7 +23,7 @@ const ChickinLogsView = ({
   rawDataApprovals: BaseApproval[];
 }) => {
   const [chickinErrorMessage, setChickinErrorMessage] = useState('');
-  const { openChickinApproveModal } = useChickinStore();
+  const { openChickinApproveModal, openChickinDeleteModal } = useChickinStore();
 
   const handleClickApprove = () => {
     openChickinApproveModal(initialValues, async (notes?: string) => {
@@ -44,6 +44,21 @@ const ChickinLogsView = ({
     });
   };
 
+  const handleDeleteChickin = (chickinId: number) => {
+    openChickinDeleteModal(chickinId, async () => {
+      const deleteRes = await ChickinApi.delete(chickinId);
+
+      if (isResponseSuccess(deleteRes)) {
+        toast.success(deleteRes?.message || 'Chickin berhasil dihapus');
+        afterSubmit && afterSubmit();
+      }
+
+      if (isResponseError(deleteRes)) {
+        toast.error(deleteRes?.message || 'Gagal menghapus chickin');
+      }
+    });
+  };
+
   return (
     <>
       <div className='px-4 pb-4 flex flex-col gap-4'>
@@ -86,6 +101,7 @@ const ChickinLogsView = ({
                     <div className='text-lg font-semibold'>
                       Chick In #{index + 1} - {latestApproval?.step_number}
                     </div>
+                    <div className='flex flex-row gap-2 items-center'>
                       <PillBadge
                         content={
                           isApproved ? 'Disetujui' : isPending ? 'Pending' : '-'
@@ -94,6 +110,21 @@ const ChickinLogsView = ({
                           isApproved ? 'green' : isPending ? 'yellow' : 'gray'
                         }
                       />
+
+                      {isApproved && (
+                        <Button
+                          color='error'
+                          className='w-fit text-sm text-base-100 rounded-lg shadow-sm btn-xs!'
+                          onClick={() => handleDeleteChickin(chickin.id)}
+                        >
+                          <Icon
+                            icon='heroicons:trash-solid'
+                            width={10}
+                            height={10}
+                          />
+                        </Button>
+                      )}
+                    </div>
                   </div>
 
                   {/* Tanggal Chick In */}

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

@@ -3,7 +3,10 @@
 import Button from '@/components/Button';
 import CheckboxInput from '@/components/input/CheckboxInput';
 import DebouncedTextInput from '@/components/input/DebouncedTextInput';
-import { OptionType, useSelect } from '@/components/input/SelectInput';
+import SelectInput, {
+  OptionType,
+  useSelect,
+} from '@/components/input/SelectInput';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
@@ -18,20 +21,30 @@ 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 { useRouter } from 'next/navigation';
+import { useRouter, usePathname } from 'next/navigation';
 import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
+import { useUiStore } from '@/stores/ui/ui.store';
 import toast from 'react-hot-toast';
 import useSWR from 'swr';
+import { useFormik } from 'formik';
 
 import RequirePermission from '@/components/helper/RequirePermission';
 import StatusBadge from '@/components/helper/StatusBadge';
 import PopoverButton from '@/components/popover/PopoverButton';
 import PopoverContent from '@/components/popover/PopoverContent';
 import ProjectFlockConfirmationModal from './ProjectFlockConfirmationModal';
+import ProjectFlockTableSkeleton from '@/components/pages/production/project-flock/skeleton/ProjectFlockTableSkeleton';
 import { useProjectFlockStore } from '@/stores/production/project-flock/project-flock.store';
 import { ProjectFlockFormValues } from './form/ProjectFlockForm.schema';
 import { useChickinStore } from '@/stores/production/chickin/chickin.store';
 import { useProjectFlockClosingStore } from '@/stores/production/project-flock-closing/project-flock-closing.store';
+import {
+  ProjectFlockFilterSchema,
+  ProjectFlockFilterType,
+} from './filter/ProjectFlockFilter';
+import Modal from '@/components/Modal';
+import SelectInputRadio from '@/components/input/SelectInputRadio';
+import ButtonFilter from '@/components/helper/ButtonFilter';
 
 const RowOptionsMenu = ({
   props,
@@ -136,6 +149,9 @@ const RowOptionsMenu = ({
 };
 
 const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const isSuccess = useProjectFlockStore((s) => s.isSuccess);
   const setIsSuccess = useProjectFlockStore((s) => s.setIsSuccess);
   const createdProjectFlock = useProjectFlockStore(
@@ -154,19 +170,21 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
   } = useTableFilter({
     initial: {
       search: '',
-      areaFilter: '',
+      area_id: '',
-      locationFilter: '',
+      location_id: '',
-      kandangFilter: '',
+      kandang_id: '',
-      periodFilter: '',
+      category: '',
+      period: '',
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
       search: 'search',
-      areaFilter: 'area_id',
+      area_id: 'area_id',
-      locationFilter: 'location_id',
+      location_id: 'location_id',
-      kandangFilter: 'kandang_id',
+      kandang_id: 'kandang_id',
-      periodFilter: 'period',
+      category: 'category',
+      period: 'period',
     },
   });
   const router = useRouter();
@@ -182,6 +200,7 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
   const confirmModal = useModal();
   const successModal = useModal();
   const chickinApproveModal = useModal();
+  const chickinDeleteModal = useModal();
   const closingModal = useModal();
   const [approvalAction, setApprovalAction] = useState<'APPROVED' | 'REJECTED'>(
     'APPROVED'
@@ -196,6 +215,11 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
     chickinApproveCallback,
     closeChickinApproveModal,
     setChickinApproveLoading,
+    isChickinDeleteModalOpen,
+    isChickinDeleteLoading,
+    chickinDeleteCallback,
+    closeChickinDeleteModal,
+    setChickinDeleteLoading,
   } = useChickinStore();
 
   const {
@@ -207,6 +231,171 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
     setClosingLoading,
   } = useProjectFlockClosingStore();
 
+  // ===== FILTER MODAL STATE =====
+  const filterModal = useModal();
+
+  // ===== FILTER DEPENDENCIES STATE =====
+  const [filterAreaId, setFilterAreaId] = useState<string | undefined>(
+    undefined
+  );
+  const [filterLocationId, setFilterLocationId] = useState<string | undefined>(
+    undefined
+  );
+
+  // ===== FORMIK SETUP FOR FILTER =====
+  const formik = useFormik<ProjectFlockFilterType>({
+    initialValues: {
+      area_id: null,
+      location_id: null,
+      kandang_id: null,
+      category: null,
+      period: null,
+    },
+    validationSchema: ProjectFlockFilterSchema,
+    onSubmit: (values, { setSubmitting }) => {
+      updateFilter('area_id', values.area_id || '');
+      updateFilter('location_id', values.location_id || '');
+      updateFilter('kandang_id', values.kandang_id || '');
+      updateFilter('category', values.category || '');
+      updateFilter('period', values.period || '');
+      filterModal.closeModal();
+      setSubmitting(false);
+    },
+    onReset: () => {
+      updateFilter('area_id', '');
+      updateFilter('location_id', '');
+      updateFilter('kandang_id', '');
+      updateFilter('category', '');
+      updateFilter('period', '');
+      setFilterAreaId(undefined);
+      setFilterLocationId(undefined);
+      filterModal.closeModal();
+    },
+  });
+
+  // ===== FILTER OPTIONS =====
+  const {
+    setInputValue: setAreaInputValue,
+    options: areaOptions,
+    isLoadingOptions: isLoadingAreaOptions,
+    loadMore: loadMoreAreas,
+  } = useSelect(AreaApi.basePath, 'id', 'name');
+
+  const {
+    setInputValue: setLocationInputValue,
+    options: locationOptions,
+    isLoadingOptions: isLoadingLocationOptions,
+    loadMore: loadMoreLocations,
+  } = useSelect(LocationApi.basePath, 'id', 'name', 'search', {
+    area_id: filterAreaId || '',
+  });
+
+  const {
+    setInputValue: setKandangInputValue,
+    options: kandangOptions,
+    isLoadingOptions: isLoadingKandangOptions,
+    loadMore: loadMoreKandangs,
+  } = useSelect(KandangApi.basePath, 'id', 'name', 'search', {
+    area_id: filterAreaId || '',
+    location_id: filterLocationId || '',
+  });
+
+  const categoryOptions = useMemo(
+    () => [
+      { value: 'GROWING', label: 'Growing' },
+      { value: 'LAYING', label: 'Laying' },
+    ],
+    []
+  );
+
+  const periodOptions = useMemo(
+    () => [
+      { value: '1', label: 'Periode 1' },
+      { value: '2', label: 'Periode 2' },
+    ],
+    []
+  );
+
+  // ===== FILTER HELPERS =====
+  const areaValue = useMemo(() => {
+    if (!formik.values.area_id) return null;
+    return (
+      areaOptions.find((opt) => String(opt.value) === formik.values.area_id) ||
+      null
+    );
+  }, [formik.values.area_id, areaOptions]);
+
+  const locationValue = useMemo(() => {
+    if (!formik.values.location_id) return null;
+    return (
+      locationOptions.find(
+        (opt) => String(opt.value) === formik.values.location_id
+      ) || null
+    );
+  }, [formik.values.location_id, locationOptions]);
+
+  const kandangValue = useMemo(() => {
+    if (!formik.values.kandang_id) return null;
+    return (
+      kandangOptions.find(
+        (opt) => String(opt.value) === formik.values.kandang_id
+      ) || null
+    );
+  }, [formik.values.kandang_id, kandangOptions]);
+
+  const categoryValue = useMemo(() => {
+    if (!formik.values.category) return null;
+    return (
+      categoryOptions.find((opt) => opt.value === formik.values.category) ||
+      null
+    );
+  }, [formik.values.category, categoryOptions]);
+
+  const periodValue = useMemo(() => {
+    if (!formik.values.period) return null;
+    return (
+      periodOptions.find((opt) => opt.value === formik.values.period) || null
+    );
+  }, [formik.values.period, periodOptions]);
+
+  // ===== FILTER DEPENDENCY HANDLERS =====
+  const handleFilterAreaChange = (area: OptionType | null) => {
+    const areaId = area?.value ? String(area.value) : undefined;
+    setFilterAreaId(areaId);
+    if (!areaId) {
+      setFilterLocationId(undefined);
+      formik.setFieldValue('location_id', null);
+      formik.setFieldValue('kandang_id', null);
+    }
+  };
+
+  const handleFilterLocationChange = (location: OptionType | null) => {
+    const locationId = location?.value ? String(location.value) : undefined;
+    setFilterLocationId(locationId);
+    if (!locationId) {
+      formik.setFieldValue('kandang_id', null);
+    }
+  };
+
+  // ===== HANDLE FILTER MODAL OPEN =====
+  const handleFilterModalOpen = () => {
+    const areaId = tableFilterState.area_id || null;
+    const locationId = tableFilterState.location_id || null;
+
+    formik.setValues({
+      area_id: areaId,
+      location_id: locationId,
+      kandang_id: tableFilterState.kandang_id || null,
+      category: tableFilterState.category || null,
+      period: tableFilterState.period || null,
+    });
+
+    setFilterAreaId(areaId || undefined);
+    setFilterLocationId(locationId || undefined);
+
+    filterModal.openModal();
+  };
+
   // ===== Fetch Data =====
   const {
     data: projectFlocks,
@@ -237,7 +426,16 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
     setIsDeleteLoading(false);
     setRowSelection({});
   };
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('project-flock-table', pathname);
+  }, [pathname, setTableState]);
+
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    setSearchValue(e.target.value);
     updateFilter('search', e.target.value);
   };
   const confirmApprovalHandler = async (
@@ -286,6 +484,14 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
     }
   }, [isChickinApproveModalOpen, chickinApproveModal]);
 
+  useEffect(() => {
+    if (isChickinDeleteModalOpen) {
+      chickinDeleteModal.openModal();
+    } else {
+      chickinDeleteModal.closeModal();
+    }
+  }, [isChickinDeleteModalOpen, chickinDeleteModal]);
+
   useEffect(() => {
     if (isClosingModalOpen) {
       closingModal.openModal();
@@ -765,30 +971,12 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
                 }}
               />
 
-              <Button
+              <ButtonFilter
-                variant='outline'
+                values={tableFilterState}
-                color='none'
+                excludeFields={['page', 'pageSize', 'search']}
-                // onClick={filterModal.openModal}
+                onClick={handleFilterModalOpen}
-                className={cn(
+                className='px-3 py-2.5'
-                  'px-3 py-2.5 gap-1.5 text-sm text-base-content/50 border border-base-content/10 rounded-xl shadow-button-soft transition-all',
+              />
-                  {
-                    // 'border-primary-gradient text-primary': isFilterActive,
-                  }
-                )}
-              >
-                <Icon icon='heroicons:funnel' width={20} height={20} />
-                Filter
-                {/* {isFilterActive && (
-                  <Badge
-                    className={{
-                      badge:
-                        'p-1.5 bg-[#FF3535] text-xs text-base-100 border border-base-300 rounded-lg',
-                    }}
-                  >
-                    {filterCount}
-                  </Badge>
-                )} */}
-              </Button>
 
               <Dropdown
                 align='end'
@@ -837,12 +1025,37 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
             </div>
           </div>
 
+          <div className='flex flex-col mb-4'>
+            {isLoading ? (
+              <div className='w-full flex flex-row justify-center items-center p-4'>
+                <span className='loading loading-spinner loading-xl' />
+              </div>
+            ) : !isResponseSuccess(projectFlocks) ||
+              projectFlocks.data?.length === 0 ? (
+              <div className='p-3'>
+                <ProjectFlockTableSkeleton
+                  columns={columns}
+                  icon={
+                    <Icon
+                      icon='heroicons:document-text'
+                      className='text-white'
+                      width={20}
+                      height={20}
+                    />
+                  }
+                />
+              </div>
+            ) : (
               <Table<ProjectFlock>
-            data={isResponseSuccess(projectFlocks) ? projectFlocks?.data : []}
+                data={
+                  isResponseSuccess(projectFlocks) ? projectFlocks?.data : []
+                }
                 columns={columns}
                 pageSize={tableFilterState.pageSize}
                 page={
-              isResponseSuccess(projectFlocks) ? projectFlocks?.meta?.page : 0
+                  isResponseSuccess(projectFlocks)
+                    ? projectFlocks?.meta?.page
+                    : 0
                 }
                 totalItems={
                   isResponseSuccess(projectFlocks)
@@ -869,14 +1082,12 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
                 }}
                 withCheckbox
                 className={{
-              containerClassName: cn('p-3', {
+                  containerClassName: cn('p-3 mb-0'),
-                'w-full mb-20':
-                  isResponseSuccess(projectFlocks) &&
-                  projectFlocks?.data?.length === 0,
-              }),
                   headerColumnClassName: 'text-nowrap',
                 }}
               />
+            )}
+          </div>
         </div>
       </div>
 
@@ -1011,6 +1222,169 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
         }}
       />
 
+      {/* Chickin Delete Modal */}
+      <ConfirmationModal
+        ref={chickinDeleteModal.ref}
+        type='error'
+        text='Apakah anda yakin ingin menghapus data chick in ini?'
+        secondaryButton={{
+          text: 'Tidak',
+          onClick: () => {
+            closeChickinDeleteModal();
+          },
+        }}
+        className={{
+          modal: 'z-9999',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'error',
+          isLoading: isChickinDeleteLoading,
+          onClick: async () => {
+            if (chickinDeleteCallback) {
+              setChickinDeleteLoading(true);
+              try {
+                await chickinDeleteCallback();
+              } finally {
+                setChickinDeleteLoading(false);
+                closeChickinDeleteModal();
+              }
+            }
+          },
+        }}
+      />
+
+      {/* Filter Modal */}
+      <Modal
+        ref={filterModal.ref}
+        className={{
+          modal: 'p-0',
+          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
+        }}
+      >
+        {/* Modal Header */}
+        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
+          <div className='flex items-center gap-2 text-primary'>
+            <Icon icon='heroicons:funnel' width={20} height={20} />
+            <h3 className='font-medium text-sm'>Filter Data</h3>
+          </div>
+          <Button
+            variant='link'
+            onClick={filterModal.closeModal}
+            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
+          >
+            <Icon icon='heroicons:x-mark' width={20} height={20} />
+          </Button>
+        </div>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
+          <div className='p-4 flex flex-col gap-1.5'>
+            <SelectInput
+              label='Area'
+              placeholder='Pilih Area'
+              options={areaOptions}
+              value={areaValue}
+              onChange={(val) => {
+                if (!Array.isArray(val)) {
+                  const areaValue = val?.value ? String(val.value) : null;
+                  formik.setFieldValue('area_id', areaValue);
+                  handleFilterAreaChange(val || null);
+                }
+              }}
+              onInputChange={setAreaInputValue}
+              isLoading={isLoadingAreaOptions}
+              isClearable
+              onMenuScrollToBottom={loadMoreAreas}
+              className={{ wrapper: 'w-full' }}
+            />
+
+            <SelectInput
+              label='Lokasi'
+              placeholder='Pilih Lokasi'
+              options={locationOptions}
+              value={locationValue}
+              onChange={(val) => {
+                if (!Array.isArray(val)) {
+                  const locationValue = val?.value ? String(val.value) : null;
+                  formik.setFieldValue('location_id', locationValue);
+                  handleFilterLocationChange(val || null);
+                }
+              }}
+              onInputChange={setLocationInputValue}
+              isLoading={isLoadingLocationOptions}
+              isClearable
+              onMenuScrollToBottom={loadMoreLocations}
+              className={{ wrapper: 'w-full' }}
+            />
+
+            <SelectInput
+              label='Kandang'
+              placeholder='Pilih Kandang'
+              options={kandangOptions}
+              value={kandangValue}
+              onChange={(val) => {
+                if (!Array.isArray(val)) {
+                  formik.setFieldValue(
+                    'kandang_id',
+                    val?.value ? String(val.value) : null
+                  );
+                }
+              }}
+              onInputChange={setKandangInputValue}
+              isLoading={isLoadingKandangOptions}
+              isClearable
+              onMenuScrollToBottom={loadMoreKandangs}
+              className={{ wrapper: 'w-full' }}
+            />
+
+            <SelectInputRadio
+              label='Kategori'
+              placeholder='Pilih Kategori'
+              options={categoryOptions}
+              value={categoryValue}
+              onChange={(val) => {
+                if (!Array.isArray(val)) {
+                  formik.setFieldValue('category', val?.value || null);
+                }
+              }}
+              className={{ wrapper: 'w-full' }}
+              isClearable={true}
+            />
+
+            <SelectInputRadio
+              label='Periode'
+              placeholder='Pilih Periode'
+              options={periodOptions}
+              value={periodValue}
+              onChange={(val) => {
+                if (!Array.isArray(val)) {
+                  formik.setFieldValue('period', val?.value || null);
+                }
+              }}
+              className={{ wrapper: 'w-full' }}
+              isClearable
+            />
+          </div>
+
+          {/* Modal Footer */}
+          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
+            <Button
+              type='reset'
+              variant='soft'
+              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
+            >
+              Reset Filter
+            </Button>
+            <Button
+              type='submit'
+              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
+              disabled={!formik.isValid || formik.isSubmitting}
+            >
+              Apply Filter
+            </Button>
+          </div>
+        </form>
+      </Modal>
+
       {/* Project Flock Closing Modal */}
       <ConfirmationModal
         ref={closingModal.ref}

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

@@ -1,6 +1,7 @@
 import Button from '@/components/Button';
 import Card from '@/components/Card';
 import { RadioGroup, RadioGroupItem } from '@/components/input/RadioInput';
+import { useSelect } from '@/components/input/SelectInput';
 import Tooltip from '@/components/Tooltip';
 import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
 import { cn, formatCurrency, formatDate, formatNumber } from '@/lib/helper';
@@ -37,10 +38,37 @@ const ProjectFlockDetail = ({
     null
   );
 
+  const { rawData: projectFlockRawData } = useSelect<ProjectFlock>(
+    ProjectFlockApi.basePath,
+    'id',
+    'flock_name',
+    'search',
+    selectedKandangId ? { kandang_id: `[${selectedKandangId}]` } : undefined
+  );
+
   const selectedKandang = projectFlock.kandangs?.find(
     (kandang) => kandang.id === Number(selectedKandangId)
   );
 
+  // Cek apakah ada project aktif di kandang yang sama (selain project saat ini)
+  // Hanya boleh 1 kandang aktif, jadi jika ada project lain yang aktif, tidak bisa di-unclose baik kategori growing maupun laying
+  const hasActiveProjectWithSameKandang = isResponseSuccess(projectFlockRawData)
+    ? projectFlockRawData.data.some((pf) =>
+        pf.kandangs?.some(
+          (k) =>
+            k.id === Number(selectedKandangId) &&
+            pf.id !== projectFlock.id &&
+            k.status !== 'NON_ACTIVE'
+        )
+      )
+    : false;
+
+  const isCloseButtonDisabled =
+    !selectedKandangId ||
+    projectFlock?.approval?.step_number == 1 ||
+    (selectedKandang?.status === 'NON_ACTIVE' &&
+      hasActiveProjectWithSameKandang);
+
   const { data: projectFlockApprovalResponse } = useSWR(
     projectFlock.id ? ['approval-project-flock', projectFlock.id] : undefined,
     ([, id]) => ProjectFlockApi.getApprovalLineHistory(Number(id))
@@ -419,10 +447,7 @@ const ProjectFlockDetail = ({
                   className='w-full px-2 py-1 text-sm'
                   variant='outline'
                   color='error'
-                  disabled={
+                  disabled={isCloseButtonDisabled}
-                    !selectedKandangId ||
-                    projectFlock?.approval?.step_number == 1
-                  }
                 >
                   {selectedKandang?.status === 'NON_ACTIVE' ? (
                     <>

src/components/pages/production/project-flock/filter/ProjectFlockFilter.ts

@@ -0,0 +1,21 @@
+import * as yup from 'yup';
+
+export type ProjectFlockFilterType = {
+  area_id: string | null;
+  location_id: string | null;
+  kandang_id: string | null;
+  category: string | null;
+  period: string | null;
+};
+
+export const ProjectFlockFilterSchema = yup.object({
+  area_id: yup.string().nullable(),
+  location_id: yup.string().nullable(),
+  kandang_id: yup.string().nullable(),
+  category: yup.string().nullable(),
+  period: yup.string().nullable(),
+});
+
+export type ProjectFlockFilterValues = yup.InferType<
+  typeof ProjectFlockFilterSchema
+>;