From 1fb9687142a75670f926b405d357893d9b40fc01 Mon Sep 17 00:00:00 2001
From: rstubryan <restubumirr@gmail.com>
Date: Wed, 4 Mar 2026 10:44:22 +0700
Subject: [PATCH] feat(FE): Add filter functionality to inventory tables

---
 .../adjustment/InventoryAdjustmentTable.tsx   | 416 +++++++++++++++---
 .../adjustment/filter/AdjustmentFilter.ts     |  13 +
 .../inventory/movement/MovementTable.tsx      | 357 +++++++++++----
 .../movement/filter/MovementFilter.ts         |  11 +
 4 files changed, 659 insertions(+), 138 deletions(-)
 create mode 100644 src/components/pages/inventory/adjustment/filter/AdjustmentFilter.ts
 create mode 100644 src/components/pages/inventory/movement/filter/MovementFilter.ts

diff --git a/src/components/pages/inventory/adjustment/InventoryAdjustmentTable.tsx b/src/components/pages/inventory/adjustment/InventoryAdjustmentTable.tsx
index ec5ebe44..fe7a2f77 100644
--- a/src/components/pages/inventory/adjustment/InventoryAdjustmentTable.tsx
+++ b/src/components/pages/inventory/adjustment/InventoryAdjustmentTable.tsx
@@ -1,22 +1,48 @@
 'use client';
 
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import {
+  ChangeEventHandler,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
+import { usePathname } from 'next/navigation';
 import useSWR from 'swr';
 import { Icon } from '@iconify/react';
 import { ColumnDef, ColumnSort, SortingState } from '@tanstack/react-table';
+import { useFormik } from 'formik';
 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 { TRANSACTION_SUBTYPE_OPTIONS } from '@/config/constant';
+
+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,9 +67,133 @@ const InventoryAdjustmentTable = () => {
       productSort: 'sort_product',
       warehouseSort: 'sort_warehouse',
       stockSort: 'sort_stock',
+      productFilter: 'product_id',
+      warehouseFilter: 'warehouse_id',
+      transactionTypeFilter: 'transaction_type',
     },
   });
 
+  // ===== 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
@@ -48,6 +201,19 @@ const InventoryAdjustmentTable = () => {
 
   const [sorting, setSorting] = useState<SortingState>([]);
 
+  useEffect(() => {
+    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(
     () => [
       {
@@ -182,76 +348,200 @@ const InventoryAdjustmentTable = () => {
   }, [sorting, updateSortingFilter]);
 
   return (
-    <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'>
-        <div className='w-fit flex flex-row gap-3 flex-wrap'>
-          <RequirePermission permissions='lti.inventory.create'>
-            <Button
-              href='/inventory/adjustment/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 Adjustment
-            </Button>
-          </RequirePermission>
-        </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 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.inventory.create'>
+              <Button
+                href='/inventory/adjustment/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 Adjustment
+              </Button>
+            </RequirePermission>
           </div>
-        ) : !isResponseSuccess(inventoryAdjustments) ||
-          inventoryAdjustments.data?.length === 0 ? (
-          <div className='p-3'>
-            <InventoryAdjustmentTableSkeleton
-              columns={inventoryAdjustmentsColumns}
-              icon={
+
+          {/* 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:document-text'
-                  className='text-white'
+                  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',
+                'productCategorySort',
+                'productSort',
+                'warehouseSort',
+                'stockSort',
+              ]}
+              onClick={handleFilterModalOpen}
+              className='px-3 py-2.5'
             />
           </div>
-        ) : (
-          <Table<InventoryAdjustment>
-            data={
-              isResponseSuccess(inventoryAdjustments)
-                ? inventoryAdjustments?.data
-                : []
-            }
-            columns={inventoryAdjustmentsColumns}
-            pageSize={tableFilterState.pageSize}
-            page={
-              isResponseSuccess(inventoryAdjustments)
-                ? inventoryAdjustments?.meta?.page
-                : 0
-            }
-            totalItems={
-              isResponseSuccess(inventoryAdjustments)
-                ? inventoryAdjustments?.meta?.total_results
-                : 0
-            }
-            onPageChange={setPage}
-            onPageSizeChange={setPageSize}
-            isLoading={isLoading}
-            sorting={sorting}
-            setSorting={setSorting}
-            className={{
-              containerClassName: cn('p-3 mb-0'),
-              headerColumnClassName: 'text-nowrap',
-            }}
-          />
-        )}
+        </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)
+                  ? inventoryAdjustments?.data
+                  : []
+              }
+              columns={inventoryAdjustmentsColumns}
+              pageSize={tableFilterState.pageSize}
+              page={
+                isResponseSuccess(inventoryAdjustments)
+                  ? inventoryAdjustments?.meta?.page
+                  : 0
+              }
+              totalItems={
+                isResponseSuccess(inventoryAdjustments)
+                  ? inventoryAdjustments?.meta?.total_results
+                  : 0
+              }
+              onPageChange={setPage}
+              onPageSizeChange={setPageSize}
+              isLoading={isLoading}
+              sorting={sorting}
+              setSorting={setSorting}
+              className={{
+                containerClassName: cn('p-3 mb-0'),
+                headerColumnClassName: 'text-nowrap',
+              }}
+            />
+          )}
+        </div>
       </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>
+    </>
   );
 };
 
diff --git a/src/components/pages/inventory/adjustment/filter/AdjustmentFilter.ts b/src/components/pages/inventory/adjustment/filter/AdjustmentFilter.ts
new file mode 100644
index 00000000..4568618f
--- /dev/null
+++ b/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;
+};
diff --git a/src/components/pages/inventory/movement/MovementTable.tsx b/src/components/pages/inventory/movement/MovementTable.tsx
index f53b0ccb..597537d7 100644
--- a/src/components/pages/inventory/movement/MovementTable.tsx
+++ b/src/components/pages/inventory/movement/MovementTable.tsx
@@ -1,22 +1,42 @@
 'use client';
 
-import { ChangeEventHandler, useMemo, 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 { useUiStore } from '@/stores/ui/ui.store';
 import Button from '@/components/Button';
 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 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 = ({
   popoverPosition = 'bottom',
@@ -70,6 +90,9 @@ const RowOptionsMenu = ({
 };
 
 const MovementTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -79,13 +102,105 @@ 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(
@@ -93,7 +208,16 @@ 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);
   };
 
@@ -160,85 +284,168 @@ const MovementTable = () => {
   );
 
   return (
-    <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.inventory.transfer.create'>
-            <Button
-              href='/inventory/movement/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 Movement
-            </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='Search'
-            value={tableFilterState.search ?? ''}
-            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',
-            }}
-          />
-        </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 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.inventory.transfer.create'>
+              <Button
+                href='/inventory/movement/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 Movement
+              </Button>
+            </RequirePermission>
           </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}
-                />
+
+          {/* 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 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']}
+              onClick={handleFilterModalOpen}
+              className='px-3 py-2.5'
             />
           </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
-            }
-            onPageChange={setPage}
-            onPageSizeChange={setPageSize}
-            isLoading={isLoading}
-            sorting={sorting}
-            setSorting={setSorting}
-            className={{
-              containerClassName: cn('p-3 mb-0'),
-              headerColumnClassName: 'text-nowrap',
-            }}
-          />
-        )}
+        </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
+              }
+              onPageChange={setPage}
+              onPageSizeChange={setPageSize}
+              isLoading={isLoading}
+              sorting={sorting}
+              setSorting={setSorting}
+              className={{
+                containerClassName: cn('p-3 mb-0'),
+                headerColumnClassName: 'text-nowrap',
+              }}
+            />
+          )}
+        </div>
       </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>
+    </>
   );
 };
 
diff --git a/src/components/pages/inventory/movement/filter/MovementFilter.ts b/src/components/pages/inventory/movement/filter/MovementFilter.ts
new file mode 100644
index 00000000..fc27b898
--- /dev/null
+++ b/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;
+};