refactor(FE): Fix missing dependency in useEffect hook

it

.gitignore

@@ -45,9 +45,3 @@ next-env.d.ts
 
 # claude
 .claude
-
-# rtk
-rtk.exe
-
-# local specs
-/local-specs

.gitlab-ci.yml

@@ -15,7 +15,7 @@ default:
 # ==========================================================
 .build_template: &build_template
   stage: build
-  image: public.ecr.aws/docker/library/node:20-alpine
+  image: node:20-alpine
   cache:
     key: npm-cache
     paths:
@@ -30,10 +30,6 @@ default:
     - echo "NEXT_PUBLIC_LTI_URL=$NEXT_PUBLIC_LTI_URL"
     - echo "NEXT_PUBLIC_SSO_LOGIN_URL=$NEXT_PUBLIC_SSO_LOGIN_URL"
     - echo "NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL"
-    - echo "NEXT_PUBLIC_APP_ENV=$NEXT_PUBLIC_APP_ENV"
-    - echo "NEXT_PUBLIC_HELPDESK_URL=$NEXT_PUBLIC_HELPDESK_URL"
-    - echo "NEXT_PUBLIC_DASHBOARD_ACCOUNTING_URL=$NEXT_PUBLIC_DASHBOARD_ACCOUNTING_URL"
-    - echo "NEXT_PUBLIC_S3_PUBLIC_BASE_URL=$NEXT_PUBLIC_S3_PUBLIC_BASE_URL"
     - echo "Building Next.js static export..."
     - npx next build
     - |
@@ -45,11 +41,7 @@ default:
         "built_at": "$(date -u +"%Y-%m-%dT%H:%M:%SZ")",
         "NEXT_PUBLIC_LTI_URL": "$NEXT_PUBLIC_LTI_URL",
         "NEXT_PUBLIC_SSO_LOGIN_URL": "$NEXT_PUBLIC_SSO_LOGIN_URL",
-        "NEXT_PUBLIC_API_BASE_URL": "$NEXT_PUBLIC_API_BASE_URL",
-        "NEXT_PUBLIC_APP_ENV": "$NEXT_PUBLIC_APP_ENV",
-        "NEXT_PUBLIC_HELPDESK_URL": "$NEXT_PUBLIC_HELPDESK_URL",
-        "NEXT_PUBLIC_DASHBOARD_ACCOUNTING_URL": "$NEXT_PUBLIC_DASHBOARD_ACCOUNTING_URL"
-        "NEXT_PUBLIC_S3_PUBLIC_BASE_URL": "NEXT_PUBLIC_S3_PUBLIC_BASE_URL"
+        "NEXT_PUBLIC_API_BASE_URL": "$NEXT_PUBLIC_API_BASE_URL"
       }
       EOF
   artifacts:
@@ -64,7 +56,7 @@ default:
 .deploy_template: &deploy_template
   stage: deploy
   image:
-    name: public.ecr.aws/aws-cli/aws-cli:latest
+    name: amazon/aws-cli:latest
     entrypoint: ['/bin/sh', '-c']
   script:
     - set -e
@@ -150,10 +142,6 @@ build:dev:
     NEXT_PUBLIC_SSO_LOGIN_URL: 'https://dev-auth-erp.mbugroup.id'
     NEXT_PUBLIC_API_BASE_URL: 'https://dev-api-lti.mbugroup.id/api'
     NEXT_PUBLIC_CLIENT_ID: 'Lumbung-Telur-Indonesia'
-    NEXT_PUBLIC_APP_ENV: 'development'
-    NEXT_PUBLIC_HELPDESK_URL: 'https://dev-helpdesk.mbugroup.id/'
-    NEXT_PUBLIC_DASHBOARD_ACCOUNTING_URL: 'https://dev-dashboard-ho.mbugroup.id/'
-    NEXT_PUBLIC_S3_PUBLIC_BASE_URL: 'https://mbu-lti-storage.s3.ap-southeast-3.amazonaws.com'
 
 deploy:dev:
   <<: *deploy_template
@@ -182,9 +170,6 @@ build:staging:
     NEXT_PUBLIC_SSO_LOGIN_URL: 'https://stg-auth-erp.mbugroup.id'
     NEXT_PUBLIC_API_BASE_URL: 'https://stg-api-lti.mbugroup.id/api'
     NEXT_PUBLIC_CLIENT_ID: 'Lumbung-Telur-Indonesia'
-    NEXT_PUBLIC_APP_ENV: 'staging'
-    NEXT_PUBLIC_HELPDESK_URL: 'https://stg-helpdesk.mbugroup.id/'
-    NEXT_PUBLIC_DASHBOARD_ACCOUNTING_URL: 'https://stg-dashboard-ho.mbugroup.id/'
 
 deploy:staging:
   <<: *deploy_template
@@ -198,35 +183,3 @@ deploy:staging:
   environment:
     name: staging
     url: https://stg-lti-erp.mbugroup.id
-
-# ==========================================================
-# ====== (Branch production) ======
-# ==========================================================
-build:production:
-  <<: *build_template
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "production"'
-  environment:
-    name: staging
-  variables:
-    NEXT_PUBLIC_LTI_URL: 'https://lti-erp.mbugroup.id'
-    NEXT_PUBLIC_SSO_LOGIN_URL: 'https://auth-erp.mbugroup.id'
-    NEXT_PUBLIC_API_BASE_URL: 'https://api-lti.mbugroup.id/api'
-    NEXT_PUBLIC_CLIENT_ID: 'Lumbung-Telur-Indonesia'
-    NEXT_PUBLIC_APP_ENV: 'production'
-    NEXT_PUBLIC_HELPDESK_URL: 'https://helpdesk.mbugroup.id/'
-    NEXT_PUBLIC_DASHBOARD_ACCOUNTING_URL: 'https://dashboard-ho.mbugroup.id/'
-    NEXT_PUBLIC_S3_PUBLIC_BASE_URL: 'https://mbu-lti-storage.s3.ap-southeast-3.amazonaws.com/'
-
-deploy:production:
-  <<: *deploy_template
-  needs: ['build:production']
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "production"'
-  variables:
-    S3_BUCKET: 'production-lti-erp.mbugroup.id'
-    AWS_REGION: 'ap-southeast-3'
-    CLOUDFRONT_DISTRIBUTION_ID: 'E1SSLXKYYITASJ'
-  environment:
-    name: staging
-    url: https://lti-erp.mbugroup.id

.husky/pre-commit

@@ -1,4 +1,3 @@
 npm run format
 npm run lint
-npm run typecheck
-git add .
+npx tsc --noEmit

.rtk/filters.toml

@@ -1,13 +0,0 @@
-# Project-local RTK filters — commit this file with your repo.
-# Filters here override user-global and built-in filters.
-# Docs: https://github.com/rtk-ai/rtk#custom-filters
-schema_version = 1
-
-# Example: suppress build noise from a custom tool
-# [filters.my-tool]
-# description = "Compact my-tool output"
-# match_command = "^my-tool\\s+build"
-# strip_ansi = true
-# strip_lines_matching = ["^\\s*$", "^Downloading", "^Installing"]
-# max_lines = 30
-# on_empty = "my-tool: ok"

CLAUDE.md

@@ -1,414 +0,0 @@
-# LTI Web Client
-
-Next.js 15 (App Router) + React 19 + TypeScript front-end for the LTI ERP system.
-
-## Tech stack
-
-- **Framework:** Next.js 15.5 (App Router, Turbopack)
-- **UI:** React 19, Tailwind CSS v4, Radix UI, daisyUI, lucide-react
-- **State:** zustand
-- **Forms:** Formik + Yup, react-hook-form
-- **Data fetching:** axios + SWR (custom `httpClient` / `httpClientFetcher` in `src/services/http`)
-- **Tables:** @tanstack/react-table
-- **Reporting:** @react-pdf/renderer, jspdf, exceljs, xlsx, recharts
-
-## Scripts
-
-- `npm run dev` — lint + dev server (Turbopack)
-- `npm run build` — production build
-- `npm run lint` — ESLint
-- `npm run typecheck` — `next typegen && tsc --noEmit`
-- `npm run format` — Prettier
-- `npm run pre-commit` — format + lint + typecheck + build (Husky pre-commit hook)
-
-## Project structure
-
-```
-src/
-  app/              # Next.js App Router routes (one folder per feature)
-  components/
-    pages/{feature}/  # Page-specific components (mirrors src/app)
-    helper/           # Cross-cutting helpers (e.g. SuspenseHelper)
-    ui/               # Shared UI primitives
-  services/
-    api/            # API service classes (extend BaseApiService)
-    http/           # httpClient / httpClientFetcher
-    hooks/          # Service-level hooks
-  stores/           # zustand stores grouped by domain
-  types/api/        # Request/response types per feature
-  lib/              # Shared helpers (api-helper, formik-helper, utils, validation, …)
-  config/, styles/
-```
-
-## Feature development standard
-
-**Always follow this order when adding a new feature.** This is a team convention — deviating creates churn in code review.
-
-1. **Types** — Define payload and response types in `src/types/api/{feature}` (or `{feature}.d.ts` for small features).
-2. **API service** — Add `src/services/api/{feature}.ts` exporting a class that extends `BaseApiService<T, CreatePayload, UpdatePayload>` from [src/services/api/base.ts](src/services/api/base.ts). Use a subfolder (e.g. `src/services/api/daily-checklist/`) when the feature has multiple resource classes.
-3. **Page** — Create the route under `src/app/{feature}` and a matching `src/components/pages/{feature}` folder for its components.
-4. **Component slicing** — Break the page UI into components inside `src/components/pages/{feature}`.
-5. **Wire up the API** — Consume the service class from step 2 inside the page/components (often via SWR).
-6. **Detail layout** — When a route reads URL params via `useSearchParams` (e.g. `/feature/detail?id=123`), add `src/app/{feature}/detail/layout.tsx` that wraps `children` in `<SuspenseHelper>` from `@/components/helper/SuspenseHelper`.
-7. **Shared state** — Use zustand stores in `src/stores/{domain}` when state must cross component boundaries.
-8. **Helpers** — Reuse from [src/lib](src/lib) first (`api-helper.ts`, `formik-helper.ts`, `utils/`, `validation/`, etc.). Add new helpers there.
-
-### Reference implementations
-
-`closing`, `finance`, `expense`, `production`, `inventory`, `marketing`, `master-data`, `purchase`, `report`, `daily-checklist`, `dashboard` — all live in both `src/app/{feature}` and `src/components/pages/{feature}` and follow the standard above.
-
-## Conventions
-
-- Path alias `@/` maps to `src/`.
-- Detail pages that read `useSearchParams` MUST be wrapped in `<SuspenseHelper>` via a `layout.tsx` (see [src/app/finance/detail/layout.tsx](src/app/finance/detail/layout.tsx) for the canonical pattern).
-- API service classes inherit CRUD methods (`getAll`, `getSingle`, etc.) from `BaseApiService` — extend the class for feature-specific endpoints rather than calling `httpClient` directly from components.
-- Pre-commit runs format + lint + typecheck + build; do not bypass with `--no-verify`.
-
-## Table filter persistence pattern
-
-Data tables across all modules (master-data, inventory, finance, purchase, etc.) use `useTableFilter` with `persist: true` to persist filter state in localStorage. This allows users' search, pagination, and filter choices to survive page refreshes.
-
-**Three core principles (apply to all table components):**
-
-1. **Set formik initialValues from tableFilterState** (not hardcoded defaults)
-   - Ensures the filter modal displays currently active filters when opened
-   - Initialize directly from persisted state: `location: tableFilterState.locationFilter`
-
-2. **Pass `true` as last parameter to updateFilter calls**
-   - `updateFilter('fieldName', value, true)` immediately persists to localStorage
-   - Resets pagination to page 1 when filters change (via SWR revalidation)
-   - Apply to: search handlers, filter form submissions, reset handlers
-
-3. **Create custom formikResetHandler function**
-   - Clear each filter with `updateFilter(fieldName, defaultValue, true)`
-   - Call `formik.resetForm({ values: { ...defaults } })`
-   - Close the modal at the end
-   - Attach to both button `onClick` and form `onReset` handler
-
-**Optimization: Avoid useCallback for simple handlers**
-
-- `useCallback` adds overhead and is only useful for complex logic or memoized child components
-- Simple pass-through handlers don't need it:
-
-  ```tsx
-  // ✅ Good: Simple handler without useCallback
-  const handleFilterChange = (val) => setFieldValue('location', val);
-
-  // ❌ Avoid: Unnecessary useCallback overhead
-  const handleFilterChange = useCallback(
-    (val) => setFieldValue('location', val),
-    [setFieldValue]
-  );
-  ```
-
-**Best practice: Store OptionType objects directly, not IDs**
-
-For select inputs, store the complete `OptionType` object in both formik state and tableFilterState. This eliminates the need for computed helper values (like searching options arrays to find the matching object).
-
-```tsx
-// Type the useTableFilter with the filter state structure
-const { state: tableFilterState, updateFilter, ... } = useTableFilter<{
-  search: string;
-  locationFilter?: OptionType<string>;
-  picFilter?: OptionType<string>;
-}>({
-  initial: {
-    search: '',
-    locationFilter: undefined,
-    picFilter: undefined
-  },
-  paramMap: {
-    page: 'page',
-    pageSize: 'limit',
-    locationFilter: 'location_id',
-    picFilter: 'pic_id',
-  },
-  persist: true,
-  storeName: 'kandangs-table',
-});
-
-// Initialize formik with tableFilterState values (now typed OptionType objects)
-const formik = useFormik<KandangFilterType>({
-  initialValues: {
-    location: tableFilterState.locationFilter,
-    pic: tableFilterState.picFilter,
-  },
-  ...
-});
-
-// Handlers store the complete OptionType, not just the ID
-const handleFilterLocationChange = useCallback(
-  (val) => setFieldValue('location', val),
-  [setFieldValue]
-);
-
-// Use formik values directly in select inputs (no computed helpers needed)
-<SelectInput
-  value={formik.values.location}
-  onChange={handleFilterLocationChange}
-  ...
-/>
-```
-
-**Apply this pattern to:**
-
-- Any data table component across any module that needs persistent filters
-- Master-data tables, inventory lists, finance reports, purchase orders, etc.
-- Whenever users' filter/search/pagination choices should survive page refreshes
-
-**Reference implementations:**
-
-- `SupplierTable`, `KandangsTable`, `LocationsTable`, `CustomersTable` in `src/components/pages/master-data/`
-- Use same pattern for data tables in other modules (inventory, finance, purchase, etc.)
-
-## Server-side sorting pattern
-
-Data tables use TanStack Table's `SortingState` wired to `useTableFilter` so that sorting triggers a server re-fetch rather than client-side reordering.
-
-**Four-part wiring:**
-
-1. **Local sort state** — `const [sorting, setSorting] = useState<SortingState>([]);`
-
-2. **`useTableFilter` config** — Add `sort_by` and `order_by` to `initial` and `paramMap`. The `paramMap` key is the internal name; the value is the query param name sent to the server (they can differ, e.g. `order_by` → `sort_order`):
-
-   ```ts
-   initial: { sort_by: '', order_by: '' }
-   paramMap:  { sort_by: 'sort_by', order_by: 'sort_order' }
-   ```
-
-3. **`useEffect` sync** — Watches `sorting` and pushes changes into `useTableFilter`:
-
-   ```ts
-   useEffect(() => {
-     if (sorting.length > 0) {
-       updateFilter('sort_by', sorting[0].id, true);
-       updateFilter('order_by', sorting[0].desc ? 'desc' : 'asc', true);
-     } else {
-       updateFilter('sort_by', '');
-       updateFilter('order_by', '');
-     }
-   }, [sorting]);
-   ```
-
-4. **SWR key** — SWR uses `getTableFilterToQueryString()` as its key, so any filter change (including sort) automatically re-fetches with the new query params. TanStack Table's built-in client sorting is effectively disabled; the server does the sorting.
-
-**Pass `sorting`, `setSorting`, and `manualSorting` to `<Table>`:**
-
-```tsx
-<Table sorting={sorting} setSorting={handleSortingChange} manualSorting={true} ... />
-```
-
-`manualSorting={true}` is required — without it TanStack Table still applies its own client-side sort pass on top of the server-sorted data, producing incorrect order.
-
-**Reference implementation:** `MarketingTable` in [src/components/pages/marketing/MarketingTable.tsx](src/components/pages/marketing/MarketingTable.tsx).
-
-## Server-side file export pattern
-
-All file exports (Excel, PDF, or any format) must use **server-side generation** — the server returns a binary blob and the browser triggers a download. Never generate files client-side with `xlsx`, `@react-pdf/renderer`, `jspdf`, or similar libraries.
-
-**Rule:** Export methods live in the API service class, not in components. Components only build the query string and call the service method.
-
-### Service method (in `src/services/api/{feature}.ts`)
-
-```ts
-async exportToExcel(initialQueryString: string) {
-  const params = new URLSearchParams(initialQueryString);
-
-  params.set('export', 'excel'); // or 'pdf', 'csv', etc.
-  params.set('page', '1');
-  params.set('limit', '99999999999');
-
-  const res = await httpClient<Blob>(`${this.basePath}?${params.toString()}`, {
-    method: 'GET',
-    responseType: 'blob',
-  });
-
-  const url = window.URL.createObjectURL(new Blob([res]));
-  const link = document.createElement('a');
-  link.href = url;
-  link.setAttribute('download', `filename-${formatDate(Date.now(), 'DD-MM-YYYY')}.xlsx`);
-  document.body.appendChild(link);
-  link.click();
-  link.remove();
-}
-```
-
-- Change `export=excel` → `export=pdf` (and the file extension) for PDF exports.
-- Add one method per format; keep them side-by-side in the same service class.
-
-### Component handler (in the page/tab component)
-
-```ts
-const handleExportExcel = useCallback(async () => {
-  setIsExcelExportLoading(true);
-  try {
-    const params = new URLSearchParams();
-    if (filterParams.foo) params.set('foo', filterParams.foo);
-    // ... map all active filter params ...
-
-    await FeatureApi.exportToExcel(params.toString());
-    toast.success('Excel berhasil dibuat dan diunduh.');
-  } catch {
-    toast.error('Gagal membuat Excel. Silakan coba lagi.');
-  } finally {
-    setIsExcelExportLoading(false);
-  }
-}, [filterParams, searchValue]);
-```
-
-- Do **not** fetch all rows into the component to build the file — delegate entirely to the service method.
-- Do **not** import `xlsx`, `@react-pdf/renderer`, `jspdf`, `exceljs` in page/tab components.
-
-**Reference implementation:** `MarketingReportApiService.exportDailyMarketingToExcel` / `exportDailyMarketingToPDF` in [src/services/api/report/marketing-report.ts](src/services/api/report/marketing-report.ts), consumed by [src/components/pages/report/marketing/tab/DailyMarketingTab.tsx](src/components/pages/report/marketing/tab/DailyMarketingTab.tsx).
-
-<!-- rtk-instructions v2 -->
-
-# RTK (Rust Token Killer) - Token-Optimized Commands
-
-## Golden Rule
-
-**Always prefix commands with `rtk`**. If RTK has a dedicated filter, it uses it. If not, it passes through unchanged. This means RTK is always safe to use.
-
-**Important**: Even in command chains with `&&`, use `rtk`:
-
-```bash
-# ❌ Wrong
-git add . && git commit -m "msg" && git push
-
-# ✅ Correct
-rtk git add . && rtk git commit -m "msg" && rtk git push
-```
-
-## RTK Commands by Workflow
-
-### Build & Compile (80-90% savings)
-
-```bash
-rtk cargo build         # Cargo build output
-rtk cargo check         # Cargo check output
-rtk cargo clippy        # Clippy warnings grouped by file (80%)
-rtk tsc                 # TypeScript errors grouped by file/code (83%)
-rtk lint                # ESLint/Biome violations grouped (84%)
-rtk prettier --check    # Files needing format only (70%)
-rtk next build          # Next.js build with route metrics (87%)
-```
-
-### Test (60-99% savings)
-
-```bash
-rtk cargo test          # Cargo test failures only (90%)
-rtk go test             # Go test failures only (90%)
-rtk jest                # Jest failures only (99.5%)
-rtk vitest              # Vitest failures only (99.5%)
-rtk playwright test     # Playwright failures only (94%)
-rtk pytest              # Python test failures only (90%)
-rtk rake test           # Ruby test failures only (90%)
-rtk rspec               # RSpec test failures only (60%)
-rtk test <cmd>          # Generic test wrapper - failures only
-```
-
-### Git (59-80% savings)
-
-```bash
-rtk git status          # Compact status
-rtk git log             # Compact log (works with all git flags)
-rtk git diff            # Compact diff (80%)
-rtk git show            # Compact show (80%)
-rtk git add             # Ultra-compact confirmations (59%)
-rtk git commit          # Ultra-compact confirmations (59%)
-rtk git push            # Ultra-compact confirmations
-rtk git pull            # Ultra-compact confirmations
-rtk git branch          # Compact branch list
-rtk git fetch           # Compact fetch
-rtk git stash           # Compact stash
-rtk git worktree        # Compact worktree
-```
-
-Note: Git passthrough works for ALL subcommands, even those not explicitly listed.
-
-### GitHub (26-87% savings)
-
-```bash
-rtk gh pr view <num>    # Compact PR view (87%)
-rtk gh pr checks        # Compact PR checks (79%)
-rtk gh run list         # Compact workflow runs (82%)
-rtk gh issue list       # Compact issue list (80%)
-rtk gh api              # Compact API responses (26%)
-```
-
-### JavaScript/TypeScript Tooling (70-90% savings)
-
-```bash
-rtk pnpm list           # Compact dependency tree (70%)
-rtk pnpm outdated       # Compact outdated packages (80%)
-rtk pnpm install        # Compact install output (90%)
-rtk npm run <script>    # Compact npm script output
-rtk npx <cmd>           # Compact npx command output
-rtk prisma              # Prisma without ASCII art (88%)
-```
-
-### Files & Search (60-75% savings)
-
-```bash
-rtk ls <path>           # Tree format, compact (65%)
-rtk read <file>         # Code reading with filtering (60%)
-rtk grep <pattern>      # Search grouped by file (75%)
-rtk find <pattern>      # Find grouped by directory (70%)
-```
-
-### Analysis & Debug (70-90% savings)
-
-```bash
-rtk err <cmd>           # Filter errors only from any command
-rtk log <file>          # Deduplicated logs with counts
-rtk json <file>         # JSON structure without values
-rtk deps                # Dependency overview
-rtk env                 # Environment variables compact
-rtk summary <cmd>       # Smart summary of command output
-rtk diff                # Ultra-compact diffs
-```
-
-### Infrastructure (85% savings)
-
-```bash
-rtk docker ps           # Compact container list
-rtk docker images       # Compact image list
-rtk docker logs <c>     # Deduplicated logs
-rtk kubectl get         # Compact resource list
-rtk kubectl logs        # Deduplicated pod logs
-```
-
-### Network (65-70% savings)
-
-```bash
-rtk curl <url>          # Compact HTTP responses (70%)
-rtk wget <url>          # Compact download output (65%)
-```
-
-### Meta Commands
-
-```bash
-rtk gain                # View token savings statistics
-rtk gain --history      # View command history with savings
-rtk discover            # Analyze Claude Code sessions for missed RTK usage
-rtk proxy <cmd>         # Run command without filtering (for debugging)
-rtk init                # Add RTK instructions to CLAUDE.md
-rtk init --global       # Add RTK to ~/.claude/CLAUDE.md
-```
-
-## Token Savings Overview
-
-| Category         | Commands                       | Typical Savings |
-| ---------------- | ------------------------------ | --------------- |
-| Tests            | vitest, playwright, cargo test | 90-99%          |
-| Build            | next, tsc, lint, prettier      | 70-87%          |
-| Git              | status, log, diff, add, commit | 59-80%          |
-| GitHub           | gh pr, gh run, gh issue        | 26-87%          |
-| Package Managers | pnpm, npm, npx                 | 70-90%          |
-| Files            | ls, read, grep, find           | 60-75%          |
-| Infrastructure   | docker, kubectl                | 85%             |
-| Network          | curl, wget                     | 65-70%          |
-
-Overall average: **60-90% token reduction** on common development operations.
-
-<!-- /rtk-instructions -->

Dockerfile

@@ -1,4 +1,4 @@
-FROM public.ecr.aws/docker/library/node:20-alpine
+FROM node:20-alpine
 
 RUN apk add --no-cache git bash build-base curl
 
@@ -22,4 +22,4 @@ RUN mkdir -p .next/server/app/_next && \
 
 EXPOSE 3000
 
-CMD ["npx", "serve", ".next/server/app", "-l", "3000"]
+CMD ["npx", "serve", ".next/server/app", "-l", "3000"]

package.json

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

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

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

src/app/expense/detail/page.tsx

@@ -15,8 +15,8 @@ const ExpenseDetailPage = () => {
   const expenseId = searchParams.get('expenseId');
 
   const { data: expense, isLoading: isLoadingExpense } = useSWR(
-    ['expense-detail', expenseId],
-    ([_, id]) => ExpenseApi.getSingle(Number(id))
+    expenseId,
+    (id: number) => ExpenseApi.getSingle(id)
   );
 
   if (!expenseId) {

src/app/master-data/system-config/page.tsx

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

src/app/production/recording/detail/edit/page.tsx

@@ -11,13 +11,10 @@ const RecordingEdit = () => {
   const searchParams = useSearchParams();
 
   const recordingId = searchParams.get('recordingId');
-  const recordingDetailKey = recordingId
-    ? ['recording-detail', recordingId]
-    : null;
 
   const { data: recording, isLoading: isLoadingRecording } = useSWR(
-    recordingDetailKey,
-    ([, id]: [string, string]) => RecordingApi.getSingle(parseInt(id))
+    recordingId,
+    (id: string) => RecordingApi.getSingle(parseInt(id))
   );
 
   if (!recordingId) {

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

@@ -11,13 +11,10 @@ const RecordingDetail = () => {
   const searchParams = useSearchParams();
 
   const recordingId = searchParams.get('recordingId');
-  const recordingDetailKey = recordingId
-    ? ['recording-detail', recordingId]
-    : null;
 
   const { data: recording, isLoading: isLoadingRecording } = useSWR(
-    recordingDetailKey,
-    ([, id]: [string, string]) => RecordingApi.getSingle(parseInt(id))
+    recordingId,
+    (id: string) => RecordingApi.getSingle(parseInt(id))
   );
 
   if (!recordingId) {

src/components/Button.tsx

@@ -51,7 +51,7 @@ const Button = ({
 
   return (
     <>
-      {(!href || (href && disabled)) && (
+      {!href && (
         <button
           {...props}
           type={type}
@@ -68,9 +68,9 @@ const Button = ({
         </button>
       )}
 
-      {href && !disabled && (
+      {href && (
         <Link
-          href={href}
+          href={disabled ? '#' : href}
           target={target}
           rel={rel}
           aria-disabled={disabled}

src/components/Pagination.tsx

@@ -226,7 +226,7 @@ const Pagination = ({
 
   const PageInfo = () => (
     <span className='text-nowrap text-sm font-medium text-base-content/50'>
-      Total Item: {totalItems} | Page {currentPage} of {totalPages}
+      Page {currentPage} of {totalPages}
     </span>
   );
 

src/components/Table.tsx

@@ -173,7 +173,6 @@ const Table = <TData extends object>({
   const tableOptions: TableOptions<TData> = {
     columns,
     data: isLoading ? (DUMMY_SKELETON_DATA as TData[]) : data, // Type assertion
-    defaultColumn: { sortDescFirst: false },
     getCoreRowModel: getCoreRowModel(),
     getSortedRowModel: getSortedRowModel(),
     getPaginationRowModel: getPaginationRowModel(),

src/components/input/NumberInput.tsx

@@ -35,9 +35,7 @@ const NumberInput = ({
       | undefined;
 
     if (newChangeEvent) {
-      newChangeEvent.target.value = parseFloat(
-        numberFormatValues.value
-      ) as unknown as string;
+      newChangeEvent.target.value = numberFormatValues.value;
 
       onChange?.(newChangeEvent);
     }

src/components/input/SelectInput.tsx

@@ -24,8 +24,8 @@ import {
 } from '@/types/api/api-general';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 
-export interface OptionType<T = string | number> {
-  value: T;
+export interface OptionType {
+  value: string | number;
   label: string;
   className?: string;
   labelClassName?: string;
@@ -523,7 +523,7 @@ const useSelect = <T,>(
 
     const qs = new URLSearchParams({
       ...(params ?? {}),
-      [searchKey ? searchKey : 'search']: inputValue ?? '',
+      [searchKey]: inputValue ?? '',
       [pageKey]: String(pageIndex + 1),
       [limitKey]: String(limit),
     }).toString();
@@ -566,31 +566,23 @@ const useSelect = <T,>(
     setSize(size + 1);
   };
 
+  let formattedSuccessRawData: SuccessApiResponse<T[]> | undefined = undefined;
+  let formattedErrorRawData: ErrorApiResponse | undefined = undefined;
+
   const latestPagesIndex = pages?.length ? pages.length - 1 : 0;
 
-  const { formattedSuccessRawData, formattedErrorRawData } = useMemo(() => {
-    let successData: SuccessApiResponse<T[]> | undefined = undefined;
-    let errorData: ErrorApiResponse | undefined = undefined;
-
-    if (isResponseSuccess(pages?.[latestPagesIndex])) {
-      successData = {
-        ...pages![latestPagesIndex],
-        data:
-          pages?.flatMap((page) =>
-            isResponseSuccess(page) ? page.data : []
-          ) ?? [],
-      };
-    }
-
-    if (isResponseError(pages?.[latestPagesIndex])) {
-      errorData = pages![latestPagesIndex];
-    }
-
-    return {
-      formattedSuccessRawData: successData,
-      formattedErrorRawData: errorData,
+  if (isResponseSuccess(pages?.[latestPagesIndex])) {
+    formattedSuccessRawData = {
+      ...pages?.[latestPagesIndex],
+      data:
+        pages?.flatMap((page) => (isResponseSuccess(page) ? page.data : [])) ??
+        [],
     };
-  }, [pages, latestPagesIndex]);
+  }
+
+  if (isResponseError(pages?.[latestPagesIndex])) {
+    formattedErrorRawData = pages?.[latestPagesIndex];
+  }
 
   return {
     inputValue,

src/components/modal/ConfirmationModalWithNotes.tsx

@@ -69,7 +69,6 @@ const ConfirmationModalWithNotes: React.FC<ConfirmationModalWithNotesProps> = ({
       secondaryButton={
         secondaryButton
           ? {
-              ...secondaryButton,
               text: secondaryButton?.text ?? 'Tidak',
               onClick: (e) => {
                 if (secondaryButton && secondaryButton?.onClick) {

src/components/pages/closing/ClosingDetailTabs.tsx

@@ -112,11 +112,12 @@ const ClosingDetail: React.FC<ClosingDetailProps> = ({
           kandangData={kandangData}
         />
 
-        <ClosingKandangList
-          initialValue={initialValue}
-          projectData={projectData}
-          selectedKandangId={kandangData?.id}
-        />
+        {!kandangData && (
+          <ClosingKandangList
+            initialValue={initialValue}
+            projectData={projectData}
+          />
+        )}
 
         <Tabs
           activeTabId={activeTabId}

src/components/pages/closing/ClosingKandangList.tsx

@@ -5,11 +5,9 @@ import { ProjectFlock } from '@/types/api/production/project-flock';
 const ClosingKandangList = ({
   initialValue,
   projectData,
-  selectedKandangId,
 }: {
   initialValue?: ClosingGeneralInformation;
   projectData?: ProjectFlock;
-  selectedKandangId?: number;
 }) => {
   return (
     <div className='w-full py-3 @container relative before:absolute before:top-0 before:left-0 before:right-0 before:-mx-4 before:border-t before:border-base-content/10'>
@@ -24,9 +22,6 @@ const ClosingKandangList = ({
                   variant='outline'
                   className='px-3 py-2.5 w-fit text-sm rounded-lg shadow-sm'
                   href={`/closing/detail/?closingId=${initialValue?.flock_id}&kandangId=${kandang.project_flock_kandang_id}`}
-                  disabled={
-                    selectedKandangId === kandang.project_flock_kandang_id
-                  }
                 >
                   {kandang.name}
                 </Button>

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

@@ -276,7 +276,7 @@ const SalesClosingTable = ({ projectFlockId }: SalesClosingTableProps) => {
       {
         id: 'kandang',
         accessorKey: 'kandang',
-        header: 'Kandang Atribusi',
+        header: 'Kandang',
         cell: (props) => {
           const kandang = props.getValue() as Kandang;
           return kandang?.name || '-';

src/components/pages/closing/table/sapronak/OutgoingSapronaksTable.tsx

@@ -127,11 +127,11 @@ const ClosingOutgoingSapronaksTable = ({
     },
     {
       accessorKey: 'source_warehouse',
-      header: 'Gudang Asal (Fisik)',
+      header: 'Gudang Asal',
     },
     {
       accessorKey: 'destination_warehouse',
-      header: 'Gudang Tujuan (Fisik)',
+      header: 'Gudang Tujuan',
     },
     {
       accessorKey: 'quantity',

src/components/pages/dashboard/DashboardProduction.tsx

@@ -9,11 +9,8 @@ import { useState, useEffect, useRef, useCallback } from 'react';
 import useSWR from 'swr';
 import { DashboardApi } from '@/services/api/dashboard';
 import { useFormik } from 'formik';
-import {
-  ProjectFlockApi,
-  ProjectFlockKandangApi,
-} from '@/services/api/production';
-import { LocationApi } from '@/services/api/master-data';
+import { ProjectFlockApi } from '@/services/api/production';
+import { KandangApi, LocationApi } from '@/services/api/master-data';
 import { generateDashboardPDF } from '@/components/pages/dashboard/export/DashboardPDF';
 import {
   DashboardFilterType,
@@ -25,7 +22,10 @@ import DashboardExportCharts, {
   DashboardExportChartsRef,
 } from '@/components/pages/dashboard/export/DashboardExportCharts';
 import { RadioGroup, RadioGroupItem } from '@/components/input/RadioInput';
-import { DashboardMeta } from '@/types/api/dashboard/dashboard';
+import {
+  DashboardFilter,
+  DashboardMeta,
+} from '@/types/api/dashboard/dashboard';
 import DashboardStats from '@/components/pages/dashboard/chart/DashboardStats';
 import { isResponseSuccess } from '@/lib/api-helper';
 import AlertErrorList from '@/components/helper/form/FormErrors';
@@ -42,8 +42,6 @@ import { cn } from '@/lib/helper';
 import DashboardExportStats, {
   DashboardExportStatsRef,
 } from '@/components/pages/dashboard/export/DashboardExportStats';
-import { ProjectFlock } from '@/types/api/production/project-flock';
-import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
 
 // Helper function to normalize values to array
 const normalizeToArray = (
@@ -70,6 +68,7 @@ const DashboardProduction = () => {
   const [analysisMode, setAnalysisMode] = useState<'OVERVIEW' | 'COMPARISON'>(
     (filterValues.analysisMode as 'OVERVIEW' | 'COMPARISON') || 'OVERVIEW'
   );
+  const [endpointUrl, setEndpointUrl] = useState('/dashboards');
   const [selectedLocationIds, setSelectedLocationIds] = useState<number[]>(
     normalizeToArray(filterValues.location)
   );
@@ -81,29 +80,9 @@ const DashboardProduction = () => {
   const {
     data: dashboardProductionResponse,
     isLoading: isLoadingDashboardProductionData,
-  } = useSWR(
-    [
-      'dashboard-production',
-      filterValues.startDate ?? '',
-      filterValues.endDate ?? '',
-      filterValues.analysisMode ?? 'OVERVIEW',
-      normalizeToArray(filterValues.location).toString(),
-      normalizeToArray(filterValues.flock).toString(),
-      normalizeToArray(filterValues.kandang).toString(),
-      filterValues.comparisonType ?? '',
-    ],
-    () =>
-      DashboardApi.getDashboardProductionFetcher({
-        start_date: filterValues.startDate || '',
-        end_date: filterValues.endDate || '',
-        analysis_mode:
-          (filterValues.analysisMode as 'OVERVIEW' | 'COMPARISON') ||
-          'OVERVIEW',
-        location_ids: normalizeToArray(filterValues.location),
-        flock_ids: normalizeToArray(filterValues.flock),
-        kandang_ids: normalizeToArray(filterValues.kandang),
-        comparison_type: filterValues.comparisonType || '',
-      })
+    mutate: refreshDashboardProductionData,
+  } = useSWR(endpointUrl, () =>
+    DashboardApi.getDashboardProductionFetcher(endpointUrl)
   );
 
   const dashboardProductionData = isResponseSuccess(dashboardProductionResponse)
@@ -116,23 +95,23 @@ const DashboardProduction = () => {
     options: flockOptions,
     isLoadingOptions: isLoadingFlockOptions,
     loadMore: loadMoreFlock,
-  } = useSelect<ProjectFlock>(
-    ProjectFlockApi.basePath,
-    'id',
-    'flock_name',
-    'search',
-    {
-      location_id: selectedLocationIds ? selectedLocationIds.toString() : '',
-    }
-  );
-
+  } = useSelect(ProjectFlockApi.basePath, 'id', 'flock_name', '', {
+    location_id: selectedLocationIds ? selectedLocationIds.toString() : '',
+  });
   const {
     setInputValue: setInputValueLocation,
     options: locationOptions,
     isLoadingOptions: isLoadingLocationOptions,
     loadMore: loadMoreLocation,
   } = useSelect(LocationApi.basePath, 'id', 'name');
-
+  const {
+    setInputValue: setInputValueKandang,
+    options: kandangOptions,
+    isLoadingOptions: isLoadingKandangOptions,
+    loadMore: loadMoreKandang,
+  } = useSelect(KandangApi.basePath, 'id', 'name', '', {
+    location_id: selectedLocationIds ? selectedLocationIds.toString() : '',
+  });
   const comparisonTypeOptions = [
     { value: 'FARM', label: 'Farm' },
     { value: 'FLOCK', label: 'Flock' },
@@ -156,43 +135,68 @@ const DashboardProduction = () => {
     enableReinitialize: true,
     validationSchema: getDashboardFilterSchema(analysisMode),
     onSubmit: (values) => {
+      // Save filter values to store
       setFilterValues(values);
-      filterModal.closeModal();
+
+      handleApplyFilter({
+        start_date: values.startDate || '',
+        end_date: values.endDate || '',
+        analysis_mode: values.analysisMode as 'OVERVIEW' | 'COMPARISON',
+        location_ids: normalizeToArray(values.location),
+        flock_ids: normalizeToArray(values.flock),
+        kandang_ids: normalizeToArray(values.kandang),
+        comparison_type: values.comparisonType,
+      });
     },
   });
 
   const { resetForm } = formik;
 
-  const selectedLocationValues = normalizeToArray(formik.values.location);
-  const selectedFlockValues = normalizeToArray(formik.values.flock);
-
-  const {
-    setInputValue: setInputValueKandang,
-    options: kandangOptions,
-    isLoadingOptions: isLoadingKandangOptions,
-    loadMore: loadMoreKandang,
-  } = useSelect<ProjectFlockKandang>(
-    ProjectFlockKandangApi.basePath,
-    'kandang_id',
-    'kandang.name',
-    'search',
-    {
-      location_id:
-        selectedLocationValues.length > 0
-          ? selectedLocationValues.toString()
-          : '',
-      project_flock_id:
-        selectedFlockValues.length > 0 ? selectedFlockValues.toString() : '',
-    }
-  );
-
   const handleResetFilter = useCallback(() => {
     resetForm();
     resetFilterValues(); // Clear stored filter values
     setAnalysisMode('OVERVIEW');
+    setEndpointUrl('/dashboards');
     setSelectedLocationIds([]);
-    filterModal.closeModal();
-  }, [filterModal, resetForm, resetFilterValues]);
+  }, [resetForm, resetFilterValues]);
+
+  const handleApplyFilter = useCallback(
+    (values: DashboardFilter) => {
+      // Build query params object, only include non-empty values
+      const params: Record<string, string> = {};
+
+      if (values.start_date) params.start_date = values.start_date;
+      if (values.end_date) params.end_date = values.end_date;
+      if (values.analysis_mode) params.analysis_mode = values.analysis_mode;
+      if (values.location_ids.length > 0)
+        params.location_ids = values.location_ids.toString();
+      if (values.flock_ids.length > 0)
+        params.flock_ids = values.flock_ids.toString();
+      if (values.kandang_ids.length > 0)
+        params.kandang_ids = values.kandang_ids.toString();
+      if (values.comparison_type)
+        params.comparison_type = values.comparison_type;
+
+      setEndpointUrl(`/dashboards?${new URLSearchParams(params).toString()}`);
+      filterModal.closeModal();
+      refreshDashboardProductionData();
+    },
+    [filterModal, refreshDashboardProductionData]
+  );
+
+  // ===== Load filter from store on mount =====
+  useEffect(() => {
+    if (!filterValues) return;
+    handleApplyFilter({
+      start_date: filterValues.startDate,
+      end_date: filterValues.endDate,
+      analysis_mode: filterValues.analysisMode as 'OVERVIEW' | 'COMPARISON',
+      location_ids: normalizeToArray(filterValues.location),
+      flock_ids: normalizeToArray(filterValues.flock),
+      kandang_ids: normalizeToArray(filterValues.kandang),
+      comparison_type: filterValues.comparisonType,
+    });
+  }, [filterValues, handleApplyFilter]);
 
   // ===== Formik Error List =====
   const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
@@ -264,6 +268,14 @@ const DashboardProduction = () => {
     };
   }, [clearNavbarActions]);
 
+  if (isLoadingDashboardProductionData) {
+    return (
+      <div className='w-full min-h-screen flex items-center justify-center'>
+        <span className='loading loading-spinner loading-xl'></span>
+      </div>
+    );
+  }
+
   return (
     <>
       <section className='w-full p-3 space-y-3'>
@@ -315,15 +327,9 @@ const DashboardProduction = () => {
         </div>
         {/* Dashboard Stats */}
         <div>
-          {isLoadingDashboardProductionData ? (
-            <div className='w-full min-h-screen flex items-center justify-center'>
-              <span className='loading loading-spinner loading-xl'></span>
-            </div>
-          ) : (
-            <DashboardStats
-              data={dashboardProductionData?.statistics_data ?? []}
-            />
-          )}
+          <DashboardStats
+            data={dashboardProductionData?.statistics_data ?? []}
+          />
         </div>
 
         {/* Use DashboardLineChart component or skeleton */}
@@ -531,7 +537,6 @@ const DashboardProduction = () => {
                   className={{
                     select: 'rounded-lg text-sm border-base-content/10',
                   }}
-                  isClearable={true}
                 />
               )}
 
@@ -568,7 +573,6 @@ const DashboardProduction = () => {
                   className={{
                     select: 'rounded-lg text-sm border-base-content/10',
                   }}
-                  isClearable={true}
                 />
               ) : (
                 <SelectInputRadio
@@ -600,7 +604,6 @@ const DashboardProduction = () => {
                   className={{
                     select: 'rounded-lg text-sm border-base-content/10',
                   }}
-                  isClearable={true}
                 />
               )}
 
@@ -640,7 +643,6 @@ const DashboardProduction = () => {
                       className={{
                         select: 'rounded-lg text-sm border-base-content/10',
                       }}
-                      isClearable={true}
                     />
                   ) : (
                     <SelectInputRadio
@@ -667,7 +669,6 @@ const DashboardProduction = () => {
                       className={{
                         select: 'rounded-lg text-sm border-base-content/10',
                       }}
-                      isClearable={true}
                     />
                   )}
                 </>
@@ -706,7 +707,6 @@ const DashboardProduction = () => {
                       className={{
                         select: 'rounded-lg text-sm border-base-content/10',
                       }}
-                      isClearable={true}
                     />
                   ) : (
                     <SelectInputRadio
@@ -733,7 +733,6 @@ const DashboardProduction = () => {
                       className={{
                         select: 'rounded-lg text-sm border-base-content/10',
                       }}
-                      isClearable={true}
                     />
                   )}
                 </>

src/components/pages/expense/ExpenseDetail.tsx

@@ -1,7 +1,6 @@
 'use client';
 
 import { useMemo, useState } from 'react';
-import { useRouter } from 'next/navigation';
 
 import { Icon } from '@iconify/react';
 import Button from '@/components/Button';
@@ -16,7 +15,6 @@ interface ExpenseDetailProps {
 }
 
 const ExpenseDetail: React.FC<ExpenseDetailProps> = ({ initialValues }) => {
-  const router = useRouter();
   const [activeTab, setActiveTab] = useState<string>('request');
 
   const expenseDetailTabs = useMemo(() => {
@@ -48,8 +46,8 @@ const ExpenseDetail: React.FC<ExpenseDetailProps> = ({ initialValues }) => {
       <section className='w-full max-w-full pb-16'>
         <header className='flex flex-col gap-4'>
           <Button
+            href='/expense'
             variant='link'
-            onClick={router.back}
             className='w-fit p-0 text-primary'
           >
             <Icon icon='uil:arrow-left' width={24} height={24} />

src/components/pages/expense/ExpenseRealizationContent.tsx

@@ -1,8 +1,5 @@
-'use client';
-
 import { useFormik } from 'formik';
 import toast from 'react-hot-toast';
-import { useSearchParams } from 'next/navigation';
 
 import Link from 'next/link';
 import { Icon } from '@iconify/react';
@@ -19,7 +16,6 @@ import {
 } from '@/components/pages/expense/form/ExpenseRequestForm.schema';
 import { ExpenseApi } from '@/services/api/expense';
 import { isResponseSuccess } from '@/lib/api-helper';
-import { buildExpenseActionHref } from '@/lib/expense-list-navigation';
 import { ACCEPTED_FILE_TYPE, S3_PUBLIC_BASE_URL } from '@/config/constant';
 
 interface ExpenseRealizationContentProps {
@@ -29,8 +25,6 @@ interface ExpenseRealizationContentProps {
 const ExpenseRealizationContent = ({
   initialValues,
 }: ExpenseRealizationContentProps) => {
-  const searchParams = useSearchParams();
-
   const formik = useFormik<UploadRequestDocumentsFormValues>({
     initialValues: {
       documents: [],
@@ -80,11 +74,7 @@ const ExpenseRealizationContent = ({
             <Button
               type='button'
               color='warning'
-              href={buildExpenseActionHref(
-                '/expense/realization/edit/',
-                initialValues?.id as number,
-                searchParams
-              )}
+              href={`/expense/realization/edit/?expenseId=${initialValues?.id}`}
               className='px-4 grow sm:grow-0'
             >
               <Icon icon='mdi:pencil-outline' width={24} height={24} />

src/components/pages/expense/ExpenseRequestContent.tsx

@@ -1,8 +1,7 @@
 'use client';
 
 import { useState } from 'react';
-import { useRouter, useSearchParams } from 'next/navigation';
-import { useSWRConfig } from 'swr';
+import { useRouter } from 'next/navigation';
 import { useFormik } from 'formik';
 import toast from 'react-hot-toast';
 
@@ -20,7 +19,6 @@ import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
 import ExpensePDFPreviewButton from '@/components/pages/expense//pdf/ExpensePDFButton';
 import RequirePermission from '@/components/helper/RequirePermission';
-import StatusBadge from '@/components/helper/StatusBadge';
 
 import { Expense } from '@/types/api/expense';
 import { formatCurrency, formatDate } from '@/lib/helper';
@@ -28,15 +26,11 @@ import {
   UploadRequestDocumentsFormSchema,
   UploadRequestDocumentsFormValues,
 } from '@/components/pages/expense/form/ExpenseRequestForm.schema';
-import { ACCEPTED_FILE_TYPE } from '@/config/constant';
+import { ACCEPTED_FILE_TYPE, S3_PUBLIC_BASE_URL } from '@/config/constant';
 import { ExpenseApi } from '@/services/api/expense';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { EXPENSE_REQUEST_APPROVAL_LINE } from '@/config/approval-line';
 import { BaseApiResponse } from '@/types/api/api-general';
-import {
-  buildExpenseActionHref,
-  getExpenseListReturnTo,
-} from '@/lib/expense-list-navigation';
 
 interface ExpenseRequestContentProps {
   initialValues?: Expense;
@@ -46,13 +40,6 @@ const ExpenseRequestContent = ({
   initialValues,
 }: ExpenseRequestContentProps) => {
   const router = useRouter();
-  const searchParams = useSearchParams();
-  const returnTo = getExpenseListReturnTo(searchParams);
-  const { mutate } = useSWRConfig();
-
-  const refreshExpense = () => {
-    mutate((key) => Array.isArray(key) && key[0] === 'expense-detail');
-  };
 
   const { approvals: approvalHistory, isLoading: isLoadingApprovalHistory } =
     useApprovalSteps({
@@ -102,24 +89,17 @@ const ExpenseRequestContent = ({
     !isLatestApprovalRejected &&
     initialValues?.latest_approval.step_number === 4;
 
-  const isExpensePaidOff = initialValues?.is_paid;
-
-  const showPaidOffButton =
-    !isExpensePaidOff && (initialValues?.latest_approval.step_number ?? 0) >= 4;
-
   // Modal hooks
   const deleteModal = useModal();
   const completeModal = useModal();
   const approveModal = useModal();
   const rejectModal = useModal();
-  const paidOffModal = useModal();
 
   // Modal loading state
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
   const [isCompleteLoading, setIsCompleteLoading] = useState(false);
   const [isApproveLoading, setIsApproveLoading] = useState(false);
   const [isRejectLoading, setIsRejectLoading] = useState(false);
-  const [isPaidOffLoading, setIsPaidOffLoading] = useState(false);
   const [, setApprovalNotes] = useState('');
 
   const formik = useFormik<UploadRequestDocumentsFormValues>({
@@ -160,31 +140,7 @@ const ExpenseRequestContent = ({
     rejectModal.openModal();
   };
 
-  const paidOffClickHandler = () => {
-    paidOffModal.openModal();
-  };
-
   // Modal confirm click handler
-  const confirmationModalPaidOffClickHandler = async () => {
-    setIsPaidOffLoading(true);
-
-    const paidOffResponse = await ExpenseApi.setExpensePaidOff(
-      initialValues?.id as number
-    );
-
-    if (isResponseSuccess(paidOffResponse)) {
-      toast.success('Berhasil menandai biaya operasional sebagai lunas!');
-      refreshExpense();
-    } else {
-      toast.error(
-        'Gagal menandai biaya operasional sebagai lunas!: ' +
-          paidOffResponse?.message
-      );
-    }
-
-    paidOffModal.closeModal();
-    setIsPaidOffLoading(false);
-  };
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
 
@@ -192,7 +148,7 @@ const ExpenseRequestContent = ({
 
     if (isResponseSuccess(deleteResponse)) {
       toast.success('Berhasil menghapus data biaya operasional!');
-      router.push(returnTo);
+      router.push('/expense');
     } else {
       toast.error('Gagal menghapus data biaya operasional!');
     }
@@ -208,7 +164,7 @@ const ExpenseRequestContent = ({
 
     if (isResponseSuccess(completeRes)) {
       toast.success(completeRes.message);
-      router.push(returnTo);
+      router.push('/expense');
     } else {
       toast.error(completeRes?.message as string);
     }
@@ -248,7 +204,7 @@ const ExpenseRequestContent = ({
 
       toast.success(approveResponse?.message);
       setApprovalNotes('');
-      router.push(returnTo);
+      router.push('/expense');
     } else {
       approveModal.closeModal();
 
@@ -283,7 +239,7 @@ const ExpenseRequestContent = ({
 
       toast.success(rejectResponse.message);
       setApprovalNotes('');
-      router.push(returnTo);
+      router.push('/expense');
     } else {
       rejectModal.closeModal();
 
@@ -323,6 +279,8 @@ const ExpenseRequestContent = ({
         )}
 
         <div className='w-full mt-4 flex flex-col gap-4'>
+          {/* TODO: apply RBAC */}
+
           <div className='w-full mx-auto flex flex-col sm:flex-row justify-end gap-2'>
             {isCurrentApprovalOnHeadArea && (
               <RequirePermission permissions='lti.expense.approve.head_area'>
@@ -409,11 +367,7 @@ const ExpenseRequestContent = ({
                 <Button
                   variant='outline'
                   color='info'
-                  href={buildExpenseActionHref(
-                    '/expense/realization/',
-                    initialValues?.id as number,
-                    searchParams
-                  )}
+                  href={`/expense/realization/?expenseId=${initialValues?.id}`}
                   className='w-full sm:w-fit'
                 >
                   <Icon
@@ -426,35 +380,13 @@ const ExpenseRequestContent = ({
               </RequirePermission>
             )}
 
-            {showPaidOffButton && (
-              <RequirePermission permissions='lti.expense.create.realization'>
-                <Button
-                  variant='outline'
-                  color='success'
-                  onClick={paidOffClickHandler}
-                  className='w-full sm:w-fit'
-                >
-                  <Icon
-                    icon='material-symbols:check-circle-outline'
-                    width={24}
-                    height={24}
-                  />
-                  Tandai Lunas
-                </Button>
-              </RequirePermission>
-            )}
-
             <div className='w-full sm:w-fit sm:ml-2 flex flex-row gap-2 items-center'>
               {showEditButton && (
                 <RequirePermission permissions='lti.expense.update'>
                   <Button
                     type='button'
                     color='warning'
-                    href={buildExpenseActionHref(
-                      '/expense/detail/edit/',
-                      initialValues?.id as number,
-                      searchParams
-                    )}
+                    href={`/expense/detail/edit/?expenseId=${initialValues?.id}`}
                     className='px-4 grow sm:grow-0'
                   >
                     <Icon icon='mdi:pencil-outline' width={24} height={24} />
@@ -589,19 +521,6 @@ const ExpenseRequestContent = ({
                     />
                   </td>
                 </tr>
-                <tr>
-                  <th>Status Lunas</th>
-                  <th>:</th>
-                  <td>
-                    <StatusBadge
-                      color={initialValues?.is_paid ? 'primary' : 'warning'}
-                      text={initialValues?.is_paid ? 'Lunas' : 'Belum Lunas'}
-                      className={{
-                        badge: 'w-fit whitespace-nowrap',
-                      }}
-                    />
-                  </td>
-                </tr>
                 <tr>
                   <th>Dokumen Pengajuan</th>
                   <th>:</th>
@@ -617,15 +536,21 @@ const ExpenseRequestContent = ({
                           <ul className='list-disc'>
                             {initialValues?.documents.map(
                               (requestDocument, requestDocumentIdx) => {
+                                const path = requestDocument.path.startsWith(
+                                  '/'
+                                )
+                                  ? requestDocument.path.slice(1)
+                                  : requestDocument.path;
+                                const documentUrl = `${S3_PUBLIC_BASE_URL}/${path}`;
                                 return (
                                   <li key={requestDocumentIdx}>
                                     <Link
-                                      href={requestDocument.path}
+                                      href={documentUrl}
                                       target='_blank'
                                       rel='noopener noreferrer'
                                       className='text-blue-500 underline'
                                     >
-                                      {requestDocument.name}{' '}
+                                      {requestDocument.path}{' '}
                                       <Icon
                                         icon='cuida:open-in-new-tab-outline'
                                         width={12}
@@ -821,21 +746,6 @@ const ExpenseRequestContent = ({
           onClick: confirmationModalRejectClickHandler,
         }}
       />
-
-      <ConfirmationModal
-        ref={paidOffModal.ref}
-        type='success'
-        text='Apakah anda yakin ingin menandai biaya operasional ini sebagai lunas?'
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          color: 'success',
-          isLoading: isPaidOffLoading,
-          onClick: confirmationModalPaidOffClickHandler,
-        }}
-      />
     </>
   );
 };

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

@@ -3,60 +3,26 @@ import * as yup from 'yup';
 export type ExpensesFilterType = {
   transaction_date: string | null;
   realization_date: string | null;
-  location: { value: number; label: string } | null;
-  vendor: { value: number; label: string } | null;
-  category: { value: string; label: string } | null;
-  approval_status: { value: string; label: string } | null;
-  realization_status: { value: string; label: string } | null;
-  project_flock: { value: number; label: string } | null;
-  project_flock_kandang: { value: number; label: 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(),
-  location: yup
-    .object({
-      value: yup.number().required(),
-      label: yup.string().required(),
-    })
-    .nullable(),
-  vendor: yup
-    .object({
-      value: yup.number().required(),
-      label: yup.string().required(),
-    })
-    .nullable(),
-  category: yup
-    .object({
-      value: yup.string().required(),
-      label: yup.string().required(),
-    })
-    .nullable(),
-  approval_status: yup
-    .object({
-      value: yup.string().required(),
-      label: yup.string().required(),
-    })
-    .nullable(),
-  realization_status: yup
-    .object({
-      value: yup.string().required(),
-      label: yup.string().required(),
-    })
-    .nullable(),
-  project_flock: yup
-    .object({
-      value: yup.number().required(),
-      label: yup.string().required(),
-    })
-    .nullable(),
-  project_flock_kandang: yup
-    .object({
-      value: yup.number().required(),
-      label: yup.string().required(),
-    })
-    .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

@@ -1,6 +1,6 @@
 'use client';
 
-import { RefObject, useCallback, useEffect, useMemo, useState } from 'react';
+import { RefObject } from 'react';
 import { useFormik } from 'formik';
 
 import { Icon } from '@iconify/react';
@@ -11,11 +11,8 @@ import SelectInput from '@/components/input/SelectInput';
 
 import { OptionType, useSelect } from '@/components/input/SelectInput';
 import { LocationApi, SupplierApi } from '@/services/api/master-data';
-import { ProjectFlockApi } from '@/services/api/production';
 import { Location } from '@/types/api/master-data/location';
 import { Supplier } from '@/types/api/master-data/supplier';
-import { ProjectFlock } from '@/types/api/production/project-flock';
-import { isResponseSuccess } from '@/lib/api-helper';
 import {
   ExpensesFilterSchema,
   ExpensesFilterValues,
@@ -34,143 +31,64 @@ const ExpensesFilterModal = ({
   onSubmit,
   onReset,
 }: ExpensesFilterModalProps) => {
-  const [selectedLocationId, setSelectedLocationId] = useState<string>(
-    initialValues?.location?.value ? String(initialValues.location.value) : ''
-  );
   const closeModalHandler = () => {
     ref.current?.close();
   };
 
-  const categoryOptions = [
-    { value: 'BOP', label: 'BOP' },
-    { value: 'NON-BOP', label: 'NON-BOP' },
-  ];
-
-  const approvalStatusOptions = [
-    { value: 'HEAD_AREA', label: 'Approval Head Area' },
-    { value: 'UNIT_VICE_PRESIDENT', label: 'Approval Unit Vice President' },
-    { value: 'FINANCE', label: 'Approval Finance' },
-    { value: 'REALISASI', label: 'Realisasi' },
-    { value: 'SELESAI', label: 'Selesai' },
-    { value: 'DITOLAK', label: 'Ditolak' },
-  ];
-
-  const realizationStatusOptions = [
-    { value: 'NOT_REALIZED', label: 'Belum Realisasi' },
-    { value: 'REALIZED', label: 'Sudah Realisasi' },
-    { value: 'REJECTED', label: 'Ditolak' },
-  ];
-
   const {
     setInputValue: setLocationInputValue,
     options: locationOptions,
     isLoadingOptions: isLoadingLocationOptions,
-    loadMore: loadMoreLocations,
   } = useSelect<Location>(LocationApi.basePath, 'id', 'name');
 
   const {
     setInputValue: setVendorInputValue,
     options: vendorOptions,
     isLoadingOptions: isLoadingVendorOptions,
-    loadMore: loadMoreVendors,
   } = useSelect<Supplier>(SupplierApi.basePath, 'id', 'name');
 
-  const {
-    setInputValue: setProjectFlockInputValue,
-    rawData: projectFlocksRawData,
-    options: projectFlockOptions,
-    isLoadingOptions: isLoadingProjectFlockOptions,
-    loadMore: loadMoreProjectFlocks,
-  } = useSelect<ProjectFlock>(
-    ProjectFlockApi.basePath,
-    'id',
-    'flock_name',
-    'search',
-    {
-      location_id: selectedLocationId || '',
-    }
-  );
-
   const formik = useFormik<ExpensesFilterValues>({
-    enableReinitialize: true,
     initialValues: initialValues || {
       transaction_date: null,
       realization_date: null,
-      location: null,
-      vendor: null,
-      category: null,
-      approval_status: null,
-      realization_status: null,
-      project_flock: null,
-      project_flock_kandang: null,
+      location_id: null,
+      vendor_id: null,
     },
     validationSchema: ExpensesFilterSchema,
     onSubmit: async (values) => {
       onSubmit?.(values);
       closeModalHandler();
     },
+    onReset: () => {
+      onReset?.();
+      closeModalHandler();
+    },
   });
 
-  useEffect(() => {
-    setSelectedLocationId(
-      initialValues?.location?.value ? String(initialValues.location.value) : ''
-    );
-  }, [initialValues?.location]);
+  const locationValue = formik.values.location_id
+    ? locationOptions.find(
+        (opt) => String(opt.value) === formik.values.location_id
+      ) || null
+    : null;
 
-  const { resetForm } = formik;
-
-  const formikResetHandler = useCallback(() => {
-    resetForm({
-      values: {
-        transaction_date: null,
-        realization_date: null,
-        location: null,
-        vendor: null,
-        category: null,
-        approval_status: null,
-        realization_status: null,
-        project_flock: null,
-        project_flock_kandang: null,
-      },
-    });
-    setSelectedLocationId('');
-    onReset?.();
-    closeModalHandler();
-  }, [resetForm, onReset, closeModalHandler]);
+  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 value = val as OptionType | null;
-    formik.setFieldValue('location', value);
-    formik.setFieldValue('project_flock', null);
-    formik.setFieldValue('project_flock_kandang', null);
-    setSelectedLocationId(value?.value ? String(value.value) : '');
+    const locationId =
+      val && !Array.isArray(val) ? (String(val.value) as string) : null;
+    formik.setFieldValue('location_id', locationId);
   };
 
   const vendorChangeHandler = (val: OptionType | OptionType[] | null) => {
-    formik.setFieldValue('vendor', val as OptionType | null);
+    const vendorId =
+      val && !Array.isArray(val) ? (String(val.value) as string) : null;
+    formik.setFieldValue('vendor_id', vendorId);
   };
 
-  const projectFlockKandangOptions = useMemo(() => {
-    if (
-      !formik.values.project_flock ||
-      !projectFlocksRawData ||
-      !isResponseSuccess(projectFlocksRawData)
-    ) {
-      return [];
-    }
-
-    const selectedProjectFlock = projectFlocksRawData.data.find(
-      (item) => item.id === formik.values.project_flock?.value
-    );
-
-    return (
-      selectedProjectFlock?.kandangs?.map((item) => ({
-        value: item.project_flock_kandang_id,
-        label: item.name,
-      })) || []
-    );
-  }, [formik.values.project_flock, projectFlocksRawData]);
-
   return (
     <Modal
       ref={ref}
@@ -180,7 +98,7 @@ const ExpensesFilterModal = ({
     >
       <form
         onSubmit={formik.handleSubmit}
-        onReset={formikResetHandler}
+        onReset={formik.handleReset}
         className='w-full flex flex-col'
       >
         {/* Modal Header */}
@@ -203,41 +121,49 @@ const ExpensesFilterModal = ({
 
         {/* Modal Body */}
         <div className='p-4 flex flex-col gap-1.5'>
-          <DateInput
-            name='transaction_date'
-            label='Tanggal Transaksi'
-            placeholder='Tanggal Transaksi'
-            value={formik.values.transaction_date || ''}
-            onChange={formik.handleChange}
-            onBlur={formik.handleBlur}
-            isError={
-              formik.touched.transaction_date &&
-              !!formik.errors.transaction_date
-            }
-          />
-
-          <DateInput
-            name='realization_date'
-            label='Tanggal Realisasi'
-            placeholder='Tanggal Realisasi'
-            value={formik.values.realization_date || ''}
-            onChange={formik.handleChange}
-            onBlur={formik.handleBlur}
-            isError={
-              formik.touched.realization_date &&
-              !!formik.errors.realization_date
-            }
-          />
+          <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={formik.values.location}
+            value={locationValue}
             onChange={locationChangeHandler}
             onInputChange={setLocationInputValue}
             isLoading={isLoadingLocationOptions}
-            onMenuScrollToBottom={loadMoreLocations}
             isClearable
             isSearchable={true}
             className={{ wrapper: 'w-full' }}
@@ -247,87 +173,14 @@ const ExpensesFilterModal = ({
             label='Vendor'
             placeholder='Pilih Vendor'
             options={vendorOptions}
-            value={formik.values.vendor}
+            value={vendorValue}
             onChange={vendorChangeHandler}
             onInputChange={setVendorInputValue}
             isLoading={isLoadingVendorOptions}
-            onMenuScrollToBottom={loadMoreVendors}
             isClearable
             isSearchable={true}
             className={{ wrapper: 'w-full' }}
           />
-
-          <SelectInput
-            label='Kategori'
-            placeholder='Pilih Kategori'
-            options={categoryOptions}
-            value={formik.values.category}
-            onChange={(val) =>
-              formik.setFieldValue('category', val as OptionType | null)
-            }
-            isClearable
-            className={{ wrapper: 'w-full' }}
-          />
-
-          <SelectInput
-            label='Status BOP'
-            placeholder='Pilih Status BOP'
-            options={approvalStatusOptions}
-            value={formik.values.approval_status}
-            onChange={(val) =>
-              formik.setFieldValue('approval_status', val as OptionType | null)
-            }
-            isClearable
-            className={{ wrapper: 'w-full' }}
-          />
-
-          <SelectInput
-            label='Status Pencairan'
-            placeholder='Pilih Status Pencairan'
-            options={realizationStatusOptions}
-            value={formik.values.realization_status}
-            onChange={(val) =>
-              formik.setFieldValue(
-                'realization_status',
-                val as OptionType | null
-              )
-            }
-            isClearable
-            className={{ wrapper: 'w-full' }}
-          />
-
-          <SelectInput
-            label='Project Flock'
-            placeholder='Pilih Project Flock'
-            options={projectFlockOptions}
-            value={formik.values.project_flock}
-            onChange={(val) => {
-              formik.setFieldValue('project_flock', val as OptionType | null);
-              formik.setFieldValue('project_flock_kandang', null);
-            }}
-            onInputChange={setProjectFlockInputValue}
-            isLoading={isLoadingProjectFlockOptions}
-            onMenuScrollToBottom={loadMoreProjectFlocks}
-            isClearable
-            isSearchable={true}
-            className={{ wrapper: 'w-full' }}
-          />
-
-          <SelectInput
-            label='Kandang'
-            placeholder='Pilih Kandang'
-            options={projectFlockKandangOptions}
-            value={formik.values.project_flock_kandang}
-            onChange={(val) =>
-              formik.setFieldValue(
-                'project_flock_kandang',
-                val as OptionType | null
-              )
-            }
-            isClearable
-            isDisabled={!formik.values.project_flock}
-            className={{ wrapper: 'w-full' }}
-          />
         </div>
 
         {/* Modal Footer */}

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

@@ -1,7 +1,7 @@
 'use client';
 
 import { useCallback, useState } from 'react';
-import { useRouter, useSearchParams } from 'next/navigation';
+import { useRouter } from 'next/navigation';
 import { useFormik } from 'formik';
 import toast from 'react-hot-toast';
 
@@ -35,7 +35,6 @@ import { isResponseError } from '@/lib/api-helper';
 import { LocationApi, SupplierApi } from '@/services/api/master-data';
 import { Supplier } from '@/types/api/master-data/supplier';
 import { ACCEPTED_FILE_TYPE } from '@/config/constant';
-import { getExpenseListReturnTo } from '@/lib/expense-list-navigation';
 import { cn } from '@/lib/helper';
 import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 
@@ -49,8 +48,6 @@ const ExpenseRealizationForm = ({
   initialValues,
 }: ExpenseRealizationFormProps) => {
   const router = useRouter();
-  const searchParams = useSearchParams();
-  const returnTo = getExpenseListReturnTo(searchParams);
 
   const [expenseFormErrorMessage, setExpenseFormErrorMessage] = useState('');
 
@@ -67,9 +64,9 @@ const ExpenseRealizationForm = ({
       }
 
       toast.success(createExpenseRes?.message as string);
-      router.push(returnTo);
+      router.push('/expense');
     },
-    [initialValues?.id, returnTo, router]
+    [router, initialValues?.id]
   );
 
   const updateExpenseHandler = useCallback(
@@ -86,9 +83,9 @@ const ExpenseRealizationForm = ({
 
       toast.success(updateExpenseRes?.message as string);
       router.refresh();
-      router.push(returnTo);
+      router.push('/expense');
     },
-    [returnTo, router]
+    [router]
   );
 
   const formik = useFormik<ExpenseRealizationFormValues>({
@@ -210,7 +207,7 @@ const ExpenseRealizationForm = ({
 
     // add new realizations for each kandang
     kandangs.forEach((kandangItem) => {
-      if (isNaN(Number(kandangItem.id))) return;
+      if (!kandangItem.id) return;
 
       const existingRealization = formik.values.realizations?.find(
         (realizationItem) => realizationItem.kandang_id === kandangItem.id
@@ -261,7 +258,7 @@ const ExpenseRealizationForm = ({
     <section className='w-full'>
       <header className='flex flex-col gap-4'>
         <Button
-          href={returnTo}
+          href='/expense'
           variant='link'
           className='w-fit p-0 text-primary'
         >

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

@@ -35,7 +35,6 @@ const ExpenseRealizationKandangDetailExpense: React.FC<
     setInputValue: setNonstockInputValue,
     options: nonstockOptions,
     isLoadingOptions: isLoadingNonstockOptions,
-    loadMore: loadMoreNonstocks,
   } = useSelect<Nonstock>(
     NonstockApi.basePath,
     'id',
@@ -165,7 +164,6 @@ const ExpenseRealizationKandangDetailExpense: React.FC<
                                       options={nonstockOptions}
                                       isLoading={isLoadingNonstockOptions}
                                       onInputChange={setNonstockInputValue}
-                                      onMenuScrollToBottom={loadMoreNonstocks}
                                       className={{ wrapper: 'min-w-48' }}
                                       isDisabled
                                     />

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

@@ -178,14 +178,14 @@ const ExpenseRequestForm = ({
     setInputValue: setLocationInputValue,
     options: locationOptions,
     isLoadingOptions: isLoadingLocationOptions,
-    loadMore: loadMoreLocations,
+    loadMore: loadMoreLocationOptions,
   } = useSelect<Location>(LocationApi.basePath, 'id', 'name');
 
   const {
     setInputValue: setVendorInputValue,
     options: supplierOptions,
     isLoadingOptions: isLoadingVendorOptions,
-    loadMore: loadMoreSuppliers,
+    loadMore: loadMoreVendorOptions,
   } = useSelect<Supplier>(SupplierApi.basePath, 'id', 'name');
 
   const categoryChangeHandler = (val: OptionType | OptionType[] | null) => {
@@ -410,13 +410,13 @@ const ExpenseRequestForm = ({
               options={locationOptions}
               onInputChange={setLocationInputValue}
               isLoading={isLoadingLocationOptions}
-              onMenuScrollToBottom={loadMoreLocations}
               isError={
                 formik.touched.location_id && Boolean(formik.errors.location_id)
               }
               errorMessage={formik.errors.location_id as string}
               isClearable
               className={{ wrapper: 'col-span-12 sm:col-span-4' }}
+              onMenuScrollToBottom={loadMoreLocationOptions}
             />
 
             <DateInput
@@ -455,12 +455,12 @@ const ExpenseRequestForm = ({
               options={supplierOptions}
               onInputChange={setVendorInputValue}
               isLoading={isLoadingVendorOptions}
-              onMenuScrollToBottom={loadMoreSuppliers}
               isError={
                 formik.touched.supplier_id && Boolean(formik.errors.supplier_id)
               }
               errorMessage={formik.errors.supplier_id as string}
               className={{ wrapper: 'col-span-12' }}
+              onMenuScrollToBottom={loadMoreVendorOptions}
             />
 
             <RequirePermission permissions='lti.expense.document'>

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

@@ -1,212 +1,154 @@
 'use client';
 
-import {
-  Document,
-  Image,
-  Link,
-  Page,
-  StyleSheet,
-  Text,
-  View,
-} from '@react-pdf/renderer';
+import React from 'react';
+import { Document, Page, StyleSheet, View, Text } from '@react-pdf/renderer';
 
 import { Expense } from '@/types/api/expense';
 import { formatCurrency, formatDate, formatNumber } from '@/lib/helper';
+import { PdfTypography } from '@/components/helper/pdf/typography/PdfTypography';
+import { PdfParamBadge } from '@/components/helper/pdf/badge/PdfParamBadge';
+import { PdfPageNumber } from '@/components/helper/pdf/layout/PdfPageNumber';
+import { PdfTable, PdfColumn } from '@/components/helper/pdf/table';
 
 interface ExpensePDFProps {
   expense?: Expense;
 }
 
-const ExpensePDFStyle = StyleSheet.create({
+const styles = StyleSheet.create({
   page: {
-    paddingTop: 24,
-    paddingBottom: 64,
-    paddingHorizontal: 32,
+    fontSize: 10,
+    fontFamily: 'Helvetica',
+    padding: 20,
+    backgroundColor: '#FFFFFF',
   },
-
-  companyInfoHeader: {
-    width: '100%',
-    display: 'flex',
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    alignItems: 'flex-start',
-    marginBottom: 8,
-  },
-  companyLogo: {
-    width: 64,
-    height: 'auto',
-  },
-  companyInfoHeaderDate: {
-    paddingTop: 8,
-    fontSize: 12,
-  },
-  companyName: {
-    fontSize: 12,
-    fontWeight: 'bold',
-    marginBottom: 4,
-  },
-  companyAddress: {
-    fontSize: 8,
-    maxWidth: 400,
+  titleSection: {
     marginBottom: 10,
   },
-
-  title: {
-    marginTop: 16,
-    fontSize: 16,
-    lineHeight: '150%',
-    textAlign: 'center',
-    fontFamily: 'Times-Roman',
-    fontWeight: 'bold',
-  },
-
-  footer: {
-    width: '100%',
-    display: 'flex',
+  parameterContainer: {
     flexDirection: 'row',
-    justifyContent: 'space-between',
-    alignItems: 'center',
-    paddingHorizontal: 32,
-
-    position: 'absolute',
+    flexWrap: 'wrap',
+    marginBottom: 8,
+  },
+  infoTableSection: {
+    marginBottom: 12,
+  },
+  infoTableTitle: {
     fontSize: 10,
-    bottom: 30,
-    left: 0,
-    right: 0,
-    textAlign: 'center',
-    color: 'grey',
-  },
-
-  // wrapper
-  generalInfoTable: {
-    width: '100%',
-    marginTop: 8,
-    borderWidth: 1,
-    borderColor: '#000000',
-    borderBottomWidth: 0,
-    fontSize: 12,
-  },
-
-  generalInfoTableRow: {
-    flexDirection: 'row',
-    borderBottomWidth: 1,
-    borderBottomColor: '#000000',
-  },
-
-  // columns
-  generalInfoTableColLabel: {
-    width: '30%',
-    paddingVertical: 6,
-    paddingHorizontal: 8,
-  },
-  generalInfoTableColSeparator: {
-    width: '3%',
-    justifyContent: 'center',
-    alignItems: 'center',
-    paddingVertical: 6,
-  },
-  generalInfoTableColValue: {
-    width: '67%',
-    paddingVertical: 6,
-    paddingHorizontal: 8,
-  },
-
-  generalInfoTableLabelText: {
     fontWeight: 'bold',
+    marginBottom: 6,
+    color: '#333',
   },
-  generalInfoTableValueText: {},
-
-  // expense detail table
-  expenseDetailContainer: {
-    width: '100%',
-    marginTop: 12,
+  tableSection: {
+    marginBottom: 12,
   },
-  expenseDetailTitle: {
-    fontSize: 14,
-    lineHeight: '150%',
-    fontFamily: 'Times-Roman',
-    fontWeight: 'bold',
-    textAlign: 'center',
-  },
-  kandangExpenseContainer: {
-    width: '100%',
-    marginTop: 8,
-  },
-  kandangExpenseTitle: {
-    fontSize: 14,
-    lineHeight: '150%',
-    fontFamily: 'Times-Roman',
-    fontWeight: 'bold',
-    textAlign: 'center',
-  },
-  kandangExpenseTable: {
-    width: '100%',
-    marginTop: 8,
-    borderWidth: 1,
-    borderColor: '#000000',
-    borderBottomWidth: 0,
-    fontSize: 12,
-  },
-  kandangExpenseTableRow: {
-    flexDirection: 'row',
-    borderBottomWidth: 1,
-    borderBottomColor: '#000000',
-  },
-  kandangExpenseTableColLabel: {
-    width: '20%',
-    paddingVertical: 6,
-    paddingHorizontal: 8,
-  },
-  kandangExpenseTableColLabelBorderRight: {
-    borderRight: '1px solid #000000',
-  },
-  kandangExpenseTableColNonstock: {
-    width: '20%',
-  },
-  kandangExpenseTableColNote: {
-    width: '40%',
-  },
-  kandangExpenseHeaderLabelText: {
-    fontWeight: 'bold',
-  },
-  kandangExpenseLabelText: {
+  tableTitle: {
     fontSize: 10,
+    fontWeight: 'bold',
+    marginBottom: 6,
+    color: '#333',
   },
-  kandangExpenseTableFooterColTotalExpenseCaption: {
-    width: '40%',
-    paddingVertical: 6,
-    paddingHorizontal: 8,
-    textAlign: 'right',
-  },
-  kandangExpenseTableFooterColTotalExpenseValue: {
-    width: '60%',
-    paddingVertical: 6,
-    paddingHorizontal: 8,
-  },
-
-  // utils
-  doubleDivider: {
-    width: '100%',
-    height: 6,
-    borderTop: '2px solid black',
-    borderBottom: '2px solid black',
+  emptyText: {
+    fontSize: 8,
+    color: '#666',
+    fontStyle: 'italic',
   },
 });
 
-const ExpensePDF = ({ expense }: ExpensePDFProps) => {
+type ExpenseKandang = Expense['kandangs'][number];
+type PengajuanItem = NonNullable<ExpenseKandang['pengajuans']>[number];
+type RealisasiItem = NonNullable<ExpenseKandang['realisasi']>[number];
+
+const valueText = (v: unknown) => {
+  if (v === null || v === undefined) return '-';
+  if (typeof v === 'number') return formatNumber(v);
+  return String(v);
+};
+
+const getPengajuanColumns = (): PdfColumn<PengajuanItem>[] => [
+  {
+    key: 'no',
+    header: 'No',
+    flex: 0.5,
+    align: 'center',
+    cell: ({ index }) => index + 1,
+  },
+  {
+    key: 'nonstock',
+    header: 'Nonstock',
+    flex: 1.5,
+    cell: ({ row }) => row.nonstock.name,
+  },
+  {
+    key: 'qty',
+    header: 'Kuantitas',
+    flex: 1,
+    align: 'right',
+    cell: ({ row }) => valueText(row.qty),
+  },
+  {
+    key: 'price',
+    header: 'Harga Satuan',
+    flex: 1.2,
+    align: 'right',
+    cell: ({ row }) => formatCurrency(row.price),
+  },
+  {
+    key: 'notes',
+    header: 'Catatan',
+    flex: 1.5,
+    cell: ({ row }) => row.notes || '-',
+  },
+];
+
+const getRealisasiColumns = (): PdfColumn<RealisasiItem>[] => [
+  {
+    key: 'no',
+    header: 'No',
+    flex: 0.5,
+    align: 'center',
+    cell: ({ index }) => index + 1,
+  },
+  {
+    key: 'nonstock',
+    header: 'Nonstock',
+    flex: 1.5,
+    cell: ({ row }) => row.nonstock.name,
+  },
+  {
+    key: 'qty',
+    header: 'Kuantitas',
+    flex: 1,
+    align: 'right',
+    cell: ({ row }) => valueText(row.qty),
+  },
+  {
+    key: 'price',
+    header: 'Harga Satuan',
+    flex: 1.2,
+    align: 'right',
+    cell: ({ row }) => formatCurrency(row.price),
+  },
+  {
+    key: 'notes',
+    header: 'Catatan',
+    flex: 1.5,
+    cell: ({ row }) => row.notes || '-',
+  },
+];
+
+const getInfoTableRows = (expense?: Expense) => {
   const isLatestApprovalRejected =
     expense?.latest_approval?.action === 'REJECTED';
   const isExpenseRealized =
     expense?.latest_approval?.step_number &&
     expense?.latest_approval.step_number >= 5;
-
   const realizationStatus = isExpenseRealized
     ? 'Sudah Realisasi'
     : 'Belum Realisasi';
 
-  const rows = [
-    { label: 'Nomor PO', value: expense?.po_number },
-    { label: 'Nomor Referensi', value: expense?.reference_number },
+  return [
+    { label: 'Nomor PO', value: expense?.po_number || '-' },
+    { label: 'Nomor Referensi', value: expense?.reference_number || '-' },
     {
       label: 'Kategori',
       value:
@@ -214,9 +156,9 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
           ? 'Biaya Operasional'
           : expense?.category === 'NON-BOP'
             ? 'Non Biaya Operasional'
-            : '',
+            : '-',
     },
-    { label: 'Lokasi', value: expense?.location.name },
+    { label: 'Lokasi', value: expense?.location?.name || '-' },
     {
       label: 'Kandang',
       value:
@@ -227,7 +169,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
               .join(', ')
           : '-',
     },
-    { label: 'Vendor', value: expense?.supplier.name },
+    { label: 'Vendor', value: expense?.supplier?.name || '-' },
     {
       label: 'Tanggal Transaksi',
       value: formatDate(expense?.transaction_date, 'DD MMMM YYYY'),
@@ -238,12 +180,12 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
         ? formatDate(expense?.realization_date, 'DD MMMM YYYY')
         : '-',
     },
-    { label: 'Nama Pengaju', value: expense?.created_user.name },
+    { label: 'Nama Pengaju', value: expense?.created_user?.name || '-' },
     {
       label: 'Nominal Biaya',
       value: formatCurrency(
-        expense?.latest_approval.step_number === 5 ||
-          expense?.latest_approval.step_number === 6
+        expense?.latest_approval?.step_number === 5 ||
+          expense?.latest_approval?.step_number === 6
           ? (expense?.total_realisasi ?? 0)
           : (expense?.total_pengajuan ?? 0)
       ),
@@ -263,401 +205,136 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
       label: 'Status Biaya',
       value: isLatestApprovalRejected
         ? 'Ditolak'
-        : expense?.latest_approval?.step_name,
+        : expense?.latest_approval?.step_name || '-',
     },
   ];
+};
+
+interface InfoRow {
+  label: string;
+  value: string;
+}
+
+const getInfoTableColumns = (): PdfColumn<InfoRow>[] => [
+  {
+    key: 'label',
+    header: 'Field',
+    flex: 1,
+    cell: ({ row }) => row.label,
+  },
+  {
+    key: 'value',
+    header: 'Value',
+    flex: 2,
+    cell: ({ row }) => row.value,
+  },
+];
+
+const ExpensePDF = ({ expense }: ExpensePDFProps) => {
+  const kandangs = expense?.kandangs || [];
+  const infoRows = getInfoTableRows(expense);
 
   return (
     <Document>
-      <Page style={ExpensePDFStyle.page}>
-        <View>
-          <View style={ExpensePDFStyle.companyInfoHeader}>
-            <Image
-              style={ExpensePDFStyle.companyLogo}
-              src='/assets/img/lti-logo.png'
-            />
-
-            <Text style={ExpensePDFStyle.companyInfoHeaderDate}>
-              {formatDate(Date.now(), 'DD MMMM YYYY')}
-            </Text>
-          </View>
-
-          <View>
-            <Text style={ExpensePDFStyle.companyName}>
-              PT LUMBUNG TELUR INDONESIA
-            </Text>
-            <Text style={ExpensePDFStyle.companyAddress}>
-              Setra Duta Raya No.L3 No.7, Ciwaruga, Kec. Parongpong, Kabupaten
-              Bandung Barat, Jawa Barat 40514
-            </Text>
-
-            <View style={ExpensePDFStyle.doubleDivider} />
+      <Page style={styles.page} size='A4'>
+        {/* Title Section */}
+        <View style={styles.titleSection}>
+          <PdfTypography size='h1' variant='primary'>
+            Laporan{' '}
+            {expense?.category === 'BOP'
+              ? 'Biaya Operasional'
+              : 'Non-Biaya Operasional'}
+          </PdfTypography>
+          <PdfTypography size='h2'>{expense?.po_number || '-'}</PdfTypography>
+          <View style={styles.parameterContainer}>
+            <PdfParamBadge>
+              Tanggal: {formatDate(Date.now(), 'DD MMMM YYYY')}
+            </PdfParamBadge>
+            <PdfParamBadge>
+              Dicetak: {formatDate(new Date(), 'DD MMM YYYY HH:mm')}
+            </PdfParamBadge>
           </View>
         </View>
 
-        <Text style={ExpensePDFStyle.title}>
-          Laporan{' '}
-          {expense?.category === 'BOP'
-            ? 'Biaya Operasional'
-            : 'Non-Biaya Operasional'}{' '}
-          {expense?.po_number}
-        </Text>
-
-        {/* General info table */}
-        <View style={ExpensePDFStyle.generalInfoTable}>
-          {rows.map((row) => (
-            <View style={ExpensePDFStyle.generalInfoTableRow} key={row.label}>
-              <View style={ExpensePDFStyle.generalInfoTableColLabel}>
-                <Text style={ExpensePDFStyle.generalInfoTableLabelText}>
-                  {row.label}
-                </Text>
-              </View>
-              <View style={ExpensePDFStyle.generalInfoTableColSeparator}>
-                <Text>:</Text>
-              </View>
-              <View style={ExpensePDFStyle.generalInfoTableColValue}>
-                <Text style={ExpensePDFStyle.generalInfoTableValueText}>
-                  {row.value}
-                </Text>
-              </View>
-            </View>
-          ))}
+        {/* Info Table Section */}
+        <View style={styles.infoTableSection}>
+          <Text style={styles.infoTableTitle}>Informasi Biaya</Text>
+          <PdfTable columns={getInfoTableColumns()} data={infoRows} />
         </View>
 
-        {/* Detail expense request */}
-        <View
-          minPresenceAhead={80}
-          style={ExpensePDFStyle.expenseDetailContainer}
-        >
-          <Text style={ExpensePDFStyle.expenseDetailTitle}>
-            Rincian Pengajuan Biaya Operasional
-          </Text>
+        {/* Rincian Pengajuan Section */}
+        <View style={styles.tableSection}>
+          <Text style={styles.tableTitle}>1. Rincian Pengajuan Biaya</Text>
+          {kandangs.length === 0 ? (
+            <Text style={styles.emptyText}>Tidak ada data pengajuan.</Text>
+          ) : (
+            kandangs.map((kandang, idx) => {
+              const pengajuans = kandang.pengajuans || [];
+              const kandangName =
+                kandang.kandang_id && kandang.name
+                  ? kandang.name
+                  : expense?.location?.name || 'Umum';
 
-          {expense?.kandangs.map((kandangExpense, kandangExpenseIdx) => {
-            let expenseRequestTotal = 0;
-
-            kandangExpense.pengajuans?.forEach(
-              (item) => (expenseRequestTotal += item.qty * item.price)
-            );
-
-            return (
-              <View
-                key={kandangExpenseIdx}
-                style={ExpensePDFStyle.kandangExpenseContainer}
-              >
-                <Text style={ExpensePDFStyle.kandangExpenseTitle}>
-                  {kandangExpense.kandang_id && kandangExpense.name
-                    ? `Biaya ${kandangExpense.name}`
-                    : `Biaya ${expense?.location.name || 'Umum'}`}
-                </Text>
-
-                <View style={ExpensePDFStyle.kandangExpenseTable}>
-                  <View style={[ExpensePDFStyle.kandangExpenseTableRow]}>
-                    <View
-                      style={[
-                        ExpensePDFStyle.kandangExpenseTableColLabel,
-                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                        ExpensePDFStyle.kandangExpenseTableColNonstock,
-                      ]}
-                    >
-                      <Text
-                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
-                      >
-                        Nonstock
-                      </Text>
-                    </View>
-                    <View
-                      style={[
-                        ExpensePDFStyle.kandangExpenseTableColLabel,
-                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                      ]}
-                    >
-                      <Text
-                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
-                      >
-                        Kuantitas
-                      </Text>
-                    </View>
-                    <View
-                      style={[
-                        ExpensePDFStyle.kandangExpenseTableColLabel,
-                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                      ]}
-                    >
-                      <Text
-                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
-                      >
-                        Harga Satuan
-                      </Text>
-                    </View>
-                    <View
-                      style={[
-                        ExpensePDFStyle.kandangExpenseTableColLabel,
-                        ExpensePDFStyle.kandangExpenseTableColNote,
-                      ]}
-                    >
-                      <Text
-                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
-                      >
-                        Catatan
-                      </Text>
-                    </View>
-                  </View>
-
-                  {kandangExpense.pengajuans?.map((pengajuan, pengajuanIdx) => (
-                    <View
-                      key={pengajuanIdx}
-                      style={ExpensePDFStyle.kandangExpenseTableRow}
-                    >
-                      <View
-                        style={[
-                          ExpensePDFStyle.kandangExpenseTableColLabel,
-                          ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                          ExpensePDFStyle.kandangExpenseTableColNonstock,
-                        ]}
-                      >
-                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
-                          {pengajuan.nonstock.name}
-                        </Text>
-                      </View>
-                      <View
-                        style={[
-                          ExpensePDFStyle.kandangExpenseTableColLabel,
-                          ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                        ]}
-                      >
-                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
-                          {formatNumber(pengajuan.qty)}
-                        </Text>
-                      </View>
-                      <View
-                        style={[
-                          ExpensePDFStyle.kandangExpenseTableColLabel,
-                          ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                        ]}
-                      >
-                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
-                          {formatCurrency(pengajuan.price)}
-                        </Text>
-                      </View>
-                      <View
-                        style={[
-                          ExpensePDFStyle.kandangExpenseTableColLabel,
-                          ExpensePDFStyle.kandangExpenseTableColNote,
-                        ]}
-                      >
-                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
-                          {pengajuan.notes}
-                        </Text>
-                      </View>
-                    </View>
-                  ))}
-
-                  <View style={[ExpensePDFStyle.kandangExpenseTableRow]}>
-                    <View
-                      style={[
-                        ExpensePDFStyle.kandangExpenseTableFooterColTotalExpenseCaption,
-                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                      ]}
-                    >
-                      <Text
-                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
-                      >
-                        Total Biaya Keseluruhan
-                      </Text>
-                    </View>
-                    <View
-                      style={[
-                        ExpensePDFStyle.kandangExpenseTableFooterColTotalExpenseValue,
-                      ]}
-                    >
-                      <Text
-                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
-                      >
-                        {formatCurrency(expenseRequestTotal)}
-                      </Text>
-                    </View>
-                  </View>
+              return (
+                <View key={idx} style={{ marginBottom: 12 }}>
+                  <PdfTypography size='h3' style={{ paddingLeft: 12 }}>
+                    {idx + 1}) {kandangName}
+                  </PdfTypography>
+                  {pengajuans.length > 0 ? (
+                    <PdfTable
+                      columns={getPengajuanColumns()}
+                      data={pengajuans}
+                      showFooter={true}
+                      footerLabel='Total'
+                    />
+                  ) : (
+                    <Text style={styles.emptyText}>
+                      Tidak ada item pengajuan untuk kandang ini.
+                    </Text>
+                  )}
                 </View>
-              </View>
-            );
-          })}
+              );
+            })
+          )}
         </View>
 
-        {/* Detail expense realization */}
-        <View
-          minPresenceAhead={80}
-          style={ExpensePDFStyle.expenseDetailContainer}
-        >
-          <Text style={ExpensePDFStyle.expenseDetailTitle}>
-            Rincian Realisasi Biaya Operasional
-          </Text>
+        {/* Rincian Realisasi Section */}
+        <View style={styles.tableSection}>
+          <Text style={styles.tableTitle}>2. Rincian Realisasi Biaya</Text>
+          {kandangs.length === 0 ? (
+            <Text style={styles.emptyText}>Tidak ada data realisasi.</Text>
+          ) : (
+            kandangs.map((kandang, idx) => {
+              const realisasi = kandang.realisasi || [];
+              const kandangName =
+                kandang.kandang_id && kandang.name
+                  ? kandang.name
+                  : expense?.location?.name || 'Umum';
 
-          {expense?.kandangs.map((kandangExpense, kandangExpenseIdx) => {
-            let expenseRealizationTotal = 0;
-
-            kandangExpense.realisasi?.forEach(
-              (item) => (expenseRealizationTotal += item.qty * item.price)
-            );
-
-            return (
-              <View
-                key={kandangExpenseIdx}
-                style={ExpensePDFStyle.kandangExpenseContainer}
-              >
-                <Text style={ExpensePDFStyle.kandangExpenseTitle}>
-                  {kandangExpense.kandang_id && kandangExpense.name
-                    ? `Biaya ${kandangExpense.name}`
-                    : `Biaya ${expense?.location.name || 'Umum'}`}
-                </Text>
-
-                <View style={ExpensePDFStyle.kandangExpenseTable}>
-                  <View style={[ExpensePDFStyle.kandangExpenseTableRow]}>
-                    <View
-                      style={[
-                        ExpensePDFStyle.kandangExpenseTableColLabel,
-                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                        ExpensePDFStyle.kandangExpenseTableColNonstock,
-                      ]}
-                    >
-                      <Text
-                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
-                      >
-                        Nonstock
-                      </Text>
-                    </View>
-                    <View
-                      style={[
-                        ExpensePDFStyle.kandangExpenseTableColLabel,
-                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                      ]}
-                    >
-                      <Text
-                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
-                      >
-                        Kuantitas
-                      </Text>
-                    </View>
-                    <View
-                      style={[
-                        ExpensePDFStyle.kandangExpenseTableColLabel,
-                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                      ]}
-                    >
-                      <Text
-                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
-                      >
-                        Harga Satuan
-                      </Text>
-                    </View>
-                    <View
-                      style={[
-                        ExpensePDFStyle.kandangExpenseTableColLabel,
-                        ExpensePDFStyle.kandangExpenseTableColNote,
-                      ]}
-                    >
-                      <Text
-                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
-                      >
-                        Catatan
-                      </Text>
-                    </View>
-                  </View>
-
-                  {kandangExpense.realisasi?.map((realisasi, realisasiIdx) => (
-                    <View
-                      key={realisasiIdx}
-                      style={ExpensePDFStyle.kandangExpenseTableRow}
-                    >
-                      <View
-                        style={[
-                          ExpensePDFStyle.kandangExpenseTableColLabel,
-                          ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                          ExpensePDFStyle.kandangExpenseTableColNonstock,
-                        ]}
-                      >
-                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
-                          {realisasi.nonstock.name}
-                        </Text>
-                      </View>
-                      <View
-                        style={[
-                          ExpensePDFStyle.kandangExpenseTableColLabel,
-                          ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                        ]}
-                      >
-                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
-                          {formatNumber(realisasi.qty)}
-                        </Text>
-                      </View>
-                      <View
-                        style={[
-                          ExpensePDFStyle.kandangExpenseTableColLabel,
-                          ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                        ]}
-                      >
-                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
-                          {formatCurrency(realisasi.price)}
-                        </Text>
-                      </View>
-                      <View
-                        style={[
-                          ExpensePDFStyle.kandangExpenseTableColLabel,
-                          ExpensePDFStyle.kandangExpenseTableColNote,
-                        ]}
-                      >
-                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
-                          {realisasi.notes}
-                        </Text>
-                      </View>
-                    </View>
-                  ))}
-
-                  <View style={[ExpensePDFStyle.kandangExpenseTableRow]}>
-                    <View
-                      style={[
-                        ExpensePDFStyle.kandangExpenseTableFooterColTotalExpenseCaption,
-                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
-                      ]}
-                    >
-                      <Text
-                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
-                      >
-                        Total Biaya Keseluruhan
-                      </Text>
-                    </View>
-                    <View
-                      style={[
-                        ExpensePDFStyle.kandangExpenseTableFooterColTotalExpenseValue,
-                      ]}
-                    >
-                      <Text
-                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
-                      >
-                        {formatCurrency(expenseRealizationTotal)}
-                      </Text>
-                    </View>
-                  </View>
+              return (
+                <View key={idx} style={{ marginBottom: 12 }}>
+                  <PdfTypography size='h3' style={{ paddingLeft: 12 }}>
+                    {idx + 1}) {kandangName}
+                  </PdfTypography>
+                  {realisasi.length > 0 ? (
+                    <PdfTable
+                      columns={getRealisasiColumns()}
+                      data={realisasi}
+                      showFooter={true}
+                      footerLabel='Total'
+                    />
+                  ) : (
+                    <Text style={styles.emptyText}>
+                      Tidak ada item realisasi untuk kandang ini.
+                    </Text>
+                  )}
                 </View>
-              </View>
-            );
-          })}
+              );
+            })
+          )}
         </View>
 
-        <View style={ExpensePDFStyle.footer} fixed>
-          <Link
-            src={`${process.env.NEXT_PUBLIC_LTI_URL}expense/detail?expenseId=${expense?.id}`}
-          >
-            {expense?.po_number}
-          </Link>
-
-          <Text
-            render={({ pageNumber, totalPages }) =>
-              `${pageNumber} / ${totalPages}`
-            }
-            fixed
-          />
-        </View>
+        <PdfPageNumber />
       </Page>
     </Document>
   );

src/components/pages/finance/FinanceTable.tsx

@@ -1,12 +1,13 @@
 'use client';
 
-import React, { useEffect, useMemo, useState } from 'react';
-import {
-  CellContext,
-  ColumnDef,
-  SortingState,
-  Updater,
-} 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';
@@ -38,7 +39,7 @@ import PopoverContent from '@/components/popover/PopoverContent';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import toast from 'react-hot-toast';
 import RequirePermission from '@/components/helper/RequirePermission';
-import ButtonFilter from '@/components/helper/ButtonFilter';
+import { useUiStore } from '@/stores/ui/ui.store';
 import {
   FinanceTableFilterSchema,
   FinanceTableFilterValues,
@@ -175,6 +176,9 @@ const RowOptionsMenu = ({
 };
 
 const FinanceTable = () => {
+  const { searchValue, setSearchValue, resetSearchValue } = useUiStore();
+  const previousPathRef = useRef<string | null>(null);
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -183,18 +187,14 @@ const FinanceTable = () => {
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
     initial: {
-      search: '',
+      search: searchValue,
       transactionTypes: '',
       bankIds: '',
       customerIds: '',
       supplierIds: '',
-      sort_by: '',
-      orderBy: '',
+      sortBy: '',
       startDate: '',
       endDate: '',
-      bankNames: '',
-      customerNames: '',
-      supplierNames: '',
     },
     paramMap: {
       page: 'page',
@@ -203,14 +203,10 @@ const FinanceTable = () => {
       bankIds: 'bank_ids',
       customerIds: 'customer_ids',
       supplierIds: 'supplier_ids',
-      sort_by: 'sort_by',
-      orderBy: 'sort_order',
+      sortBy: 'sort_date',
       startDate: 'start_date',
       endDate: 'end_date',
     },
-    excludeKeysFromUrl: ['bankNames', 'customerNames', 'supplierNames'],
-    persist: true,
-    storeName: 'finance-table',
   });
 
   // ===== FILTER MODAL STATE =====
@@ -239,7 +235,7 @@ const FinanceTable = () => {
   // ===== Formik for Filter =====
   const filterFormik = useFormik<FinanceTableFilterValues>({
     initialValues: {
-      search: tableFilterState.search || '',
+      search: searchValue,
       transaction_types: '',
       bank_ids: '',
       customer_ids: '',
@@ -249,48 +245,29 @@ const FinanceTable = () => {
       end_date: '',
     },
     validationSchema: FinanceTableFilterSchema,
-    onSubmit: (values, { setSubmitting }) => {
-      updateFilter('search', values.search, true);
-      updateFilter('transactionTypes', values.transaction_types, true);
-      updateFilter('bankIds', values.bank_ids, true);
-      updateFilter('customerIds', values.customer_ids, true);
-      updateFilter('supplierIds', values.supplier_ids, true);
-      updateFilter('sort_by', values.sort_by, true);
-      updateFilter('startDate', values.start_date, true);
-      updateFilter('endDate', values.end_date, true);
-      // Save display names for restoration on modal reopen
-      const toNames = (val: OptionType | OptionType[] | null) =>
-        val
-          ? (Array.isArray(val) ? val : [val])
-              .map((o) => String(o.label))
-              .join(',')
-          : '';
-      updateFilter('bankNames', toNames(selectedBank), true);
-      updateFilter('customerNames', toNames(selectedCustomerId), true);
-      updateFilter('supplierNames', toNames(selectedSupplierId), true);
+    enableReinitialize: true,
+    onSubmit: (values) => {
+      updateFilter('search', values.search);
+      setSearchValue(values.search);
+      updateFilter('transactionTypes', values.transaction_types);
+      updateFilter('bankIds', values.bank_ids);
+      updateFilter('customerIds', values.customer_ids);
+      updateFilter('supplierIds', values.supplier_ids);
+      updateFilter('sortBy', values.sort_by);
+      updateFilter('startDate', values.start_date);
+      updateFilter('endDate', values.end_date);
       filterModal.closeModal();
-
-      setSubmitting(false);
     },
     onReset: () => {
-      setSelectedTransactionType(null);
-      setSelectedBank(null);
-      setSelectedCustomerId(null);
-      setSelectedSupplierId(null);
-      setSelectedSortBy(null);
-      updateFilter('search', '', true);
-      updateFilter('transactionTypes', '', true);
-      updateFilter('bankIds', '', true);
-      updateFilter('customerIds', '', true);
-      updateFilter('supplierIds', '', true);
-      updateFilter('sort_by', '', true);
-      updateFilter('orderBy', '', true);
-      updateFilter('startDate', '', true);
-      updateFilter('endDate', '', true);
-      updateFilter('bankNames', '', true);
-      updateFilter('customerNames', '', true);
-      updateFilter('supplierNames', '', true);
-      filterModal.closeModal();
+      updateFilter('search', '');
+      resetSearchValue();
+      updateFilter('transactionTypes', '');
+      updateFilter('bankIds', '');
+      updateFilter('customerIds', '');
+      updateFilter('supplierIds', '');
+      updateFilter('sortBy', '');
+      updateFilter('startDate', '');
+      updateFilter('endDate', '');
     },
   });
 
@@ -343,10 +320,40 @@ 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>) => {
-    updateFilter('search', e.target.value, true);
-  };
+  const searchChangeHandler = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      updateFilter('search', e.target.value);
+      setSearchValue(e.target.value);
+      setPage(1);
+    },
+    [updateFilter, setSearchValue, setPage]
+  );
 
   const transactionTypeChangeHandler = (
     val: OptionType | OptionType[] | null
@@ -402,26 +409,6 @@ const FinanceTable = () => {
     );
   };
 
-  const sorting: SortingState = tableFilterState.sort_by
-    ? [
-        {
-          id: tableFilterState.sort_by,
-          desc: tableFilterState.orderBy === 'desc',
-        },
-      ]
-    : [];
-
-  const handleSortingChange = (updater: Updater<SortingState>) => {
-    const next = typeof updater === 'function' ? updater(sorting) : updater;
-    if (next.length > 0) {
-      updateFilter('sort_by', next[0].id, true);
-      updateFilter('orderBy', next[0].desc ? 'desc' : 'asc', true);
-    } else {
-      updateFilter('sort_by', '', true);
-      updateFilter('orderBy', '', true);
-    }
-  };
-
   const startDateChangeHandler = (e: React.ChangeEvent<HTMLInputElement>) => {
     const value = e.target.value;
     const endDate = filterFormik.values.end_date;
@@ -482,74 +469,28 @@ const FinanceTable = () => {
   };
 
   const handleFilterModalOpen = () => {
-    // Restore transaction types from stored comma-separated IDs
-    const txIds = tableFilterState.transactionTypes
-      ? tableFilterState.transactionTypes.split(',')
-      : [];
-    const restoredTxTypes = FINANCE_TRANSACTION_TYPE_OPTIONS.filter((opt) =>
-      txIds.includes(String(opt.value))
-    );
-    setSelectedTransactionType(restoredTxTypes.length ? restoredTxTypes : null);
-
-    // Restore banks from stored IDs and names
-    const bankIdList = tableFilterState.bankIds
-      ? tableFilterState.bankIds.split(',')
-      : [];
-    const bankNameList = tableFilterState.bankNames
-      ? tableFilterState.bankNames.split(',')
-      : [];
-    const restoredBanks = bankIdList.map((id, i) => ({
-      value: id,
-      label: bankNameList[i] || id,
-    }));
-    setSelectedBank(restoredBanks.length ? restoredBanks : null);
-
-    // Restore customers from stored IDs and names
-    const customerIdList = tableFilterState.customerIds
-      ? tableFilterState.customerIds.split(',')
-      : [];
-    const customerNameList = tableFilterState.customerNames
-      ? tableFilterState.customerNames.split(',')
-      : [];
-    const restoredCustomers = customerIdList.map((id, i) => ({
-      value: id,
-      label: customerNameList[i] || id,
-    }));
-    setSelectedCustomerId(restoredCustomers.length ? restoredCustomers : null);
-
-    // Restore suppliers from stored IDs and names
-    const supplierIdList = tableFilterState.supplierIds
-      ? tableFilterState.supplierIds.split(',')
-      : [];
-    const supplierNameList = tableFilterState.supplierNames
-      ? tableFilterState.supplierNames.split(',')
-      : [];
-    const restoredSuppliers = supplierIdList.map((id, i) => ({
-      value: id,
-      label: supplierNameList[i] || id,
-    }));
-    setSelectedSupplierId(restoredSuppliers.length ? restoredSuppliers : null);
-
-    // Restore sort by
-    const restoredSortBy =
-      sortByOptions.find(
-        (opt) => String(opt.value) === tableFilterState.sort_by
-      ) || null;
-    setSelectedSortBy(restoredSortBy);
-
-    // Restore formik values
-    filterFormik.setValues({
-      search: tableFilterState.search || '',
-      transaction_types: tableFilterState.transactionTypes || '',
-      bank_ids: tableFilterState.bankIds || '',
-      customer_ids: tableFilterState.customerIds || '',
-      supplier_ids: tableFilterState.supplierIds || '',
-      sort_by: tableFilterState.sort_by || '',
-      start_date: tableFilterState.startDate || '',
-      end_date: tableFilterState.endDate || '',
-    });
-
     filterModal.openModal();
+    filterFormik.validateForm();
+  };
+
+  const resetFilterHandler = () => {
+    setSelectedTransactionType(null);
+    setSelectedBank(null);
+    setSelectedCustomerId(null);
+    setSelectedSupplierId(null);
+    setSelectedSortBy(null);
+
+    filterFormik.resetForm();
+
+    updateFilter('search', '');
+    resetSearchValue();
+    updateFilter('transactionTypes', '');
+    updateFilter('bankIds', '');
+    updateFilter('customerIds', '');
+    updateFilter('supplierIds', '');
+    updateFilter('sortBy', '');
+    updateFilter('startDate', '');
+    updateFilter('endDate', '');
   };
 
   const confirmationModalDeleteClickHandler = async () => {
@@ -568,12 +509,10 @@ const FinanceTable = () => {
       {
         header: 'ID',
         accessorKey: 'payment_code',
-        enableSorting: true,
       },
       {
         header: 'References Number',
         accessorKey: 'reference_number',
-        enableSorting: true,
         cell: (props: CellContext<Finance, unknown>) => {
           const value = props.row.original.reference_number;
           return <span>{value ?? '-'}</span>;
@@ -582,7 +521,6 @@ const FinanceTable = () => {
       {
         header: 'Jenis Transaksi',
         accessorKey: 'transaction_type',
-        enableSorting: true,
         cell: (props: CellContext<Finance, unknown>) => {
           const value = props.row.original.transaction_type
             .split('_')
@@ -592,8 +530,7 @@ const FinanceTable = () => {
       },
       {
         header: 'Pihak',
-        accessorKey: 'customer_name',
-        enableSorting: true,
+        accessorFn: (finance: Finance) => finance.party?.name,
         cell: (props: CellContext<Finance, unknown>) => {
           if (props.row.original.party?.id) {
             return <span>{props.row.original.party?.name}</span>;
@@ -602,23 +539,13 @@ const FinanceTable = () => {
         },
       },
       {
-        header: 'Tanggal Pembayaran',
-        accessorKey: 'payment_date',
-        enableSorting: true,
-        cell: (props) =>
-          formatDate(props.row.original.payment_date, 'DD MMM YYYY'),
-      },
-      {
-        header: 'Tanggal Dibuat',
-        accessorKey: 'created_at',
-        enableSorting: true,
-        cell: (props) =>
-          formatDate(props.row.original.created_at, 'DD MMM YYYY'),
+        header: 'Tanggal',
+        accessorFn: (finance: Finance) =>
+          formatDate(finance.payment_date, 'DD MMM YYYY'),
       },
       {
         header: 'Metode Pembayaran',
         accessorKey: 'payment_method',
-        enableSorting: true,
         cell: (props: CellContext<Finance, unknown>) => {
           const value = props.row.original.payment_method.split('_').join(' ');
           return <span>{formatTitleCase(value)}</span>;
@@ -626,26 +553,20 @@ const FinanceTable = () => {
       },
       {
         header: 'Bank',
-        accessorKey: 'bank',
-        enableSorting: true,
-        cell: (props) =>
-          props.row.original.bank
-            ? `${props.row.original.bank?.alias} - ${props.row.original.bank?.account_number} - ${props.row.original.bank?.owner}`
+        accessorFn: (finance: Finance) =>
+          finance.bank
+            ? `${finance.bank?.alias} - ${finance.bank?.account_number} - ${finance.bank?.owner}`
             : '-',
       },
       {
         header: 'Pengeluaran (Rp)',
-        accessorKey: 'expense_amount',
-        enableSorting: true,
-        cell: (props) =>
-          formatCurrency(Math.abs(props.row.original.expense_amount)),
+        accessorFn: (finance: Finance) =>
+          formatCurrency(Math.abs(finance.expense_amount)),
       },
       {
         header: 'Pemasukan (Rp)',
-        accessorKey: 'income_amount',
-        enableSorting: true,
-        cell: (props) =>
-          formatCurrency(Math.abs(props.row.original.income_amount)),
+        accessorFn: (finance: Finance) =>
+          formatCurrency(Math.abs(finance.income_amount)),
       },
       {
         header: 'Aksi',
@@ -684,6 +605,27 @@ const FinanceTable = () => {
     };
   }, [dateErrorShown]);
 
+  useEffect(() => {
+    previousPathRef.current = window.location.pathname;
+
+    return () => {
+      const currentPath = window.location.pathname;
+
+      const isCurrentPathFinance = currentPath.includes('/finance');
+      const isPreviousPathFinance =
+        previousPathRef.current?.includes('/finance');
+
+      if (isPreviousPathFinance && !isCurrentPathFinance) {
+        resetSearchValue();
+      }
+
+      if (dateErrorShown) {
+        toast.dismiss();
+        setDateErrorShown(false);
+      }
+    };
+  }, [resetSearchValue, dateErrorShown]);
+
   return (
     <>
       <div className='w-full'>
@@ -745,20 +687,25 @@ const FinanceTable = () => {
               }}
             />
 
-            <ButtonFilter
-              values={tableFilterState}
-              excludeFields={[
-                'page',
-                'pageSize',
-                'search',
-                'orderBy',
-                'bankNames',
-                'customerNames',
-                'supplierNames',
-              ]}
+            <Button
+              variant='outline'
+              color='none'
               onClick={handleFilterModalOpen}
-              className='px-3 py-2.5'
-            />
+              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,
+                }
+              )}
+            >
+              <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>
 
@@ -794,9 +741,6 @@ const FinanceTable = () => {
               onPageChange={setPage}
               onPageSizeChange={setPageSize}
               isLoading={isLoading}
-              sorting={sorting}
-              setSorting={handleSortingChange}
-              manualSorting
               className={{
                 containerClassName: cn('p-3 mb-0'),
                 headerColumnClassName: 'text-nowrap',
@@ -930,9 +874,19 @@ const FinanceTable = () => {
           {/* 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'
+              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={() => {
+                filterFormik.resetForm();
+                setSelectedTransactionType(null);
+                setSelectedBank(null);
+                setSelectedCustomerId(null);
+                setSelectedSupplierId(null);
+                setSelectedSortBy(null);
+                resetFilterHandler();
+                filterModal.closeModal();
+              }}
             >
               Reset Filter
             </Button>

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

@@ -7,6 +7,7 @@ import {
   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';
@@ -24,10 +25,7 @@ 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 ConfirmationModal from '@/components/modal/ConfirmationModal';
-import PopoverButton from '@/components/popover/PopoverButton';
-import PopoverContent from '@/components/popover/PopoverContent';
-import toast from 'react-hot-toast';
+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';
@@ -40,89 +38,27 @@ import {
   AdjustmentFilterType,
 } from '@/components/pages/inventory/adjustment/filter/AdjustmentFilter';
 import SelectInputRadio from '@/components/input/SelectInputRadio';
-import { CellContext } from '@tanstack/react-table';
-
-const RowOptionsMenu = ({
-  popoverPosition = 'bottom',
-  props,
-  deleteClickHandler,
-}: {
-  popoverPosition: 'bottom' | 'top';
-  props: CellContext<InventoryAdjustment, unknown>;
-  deleteClickHandler: () => void;
-}) => {
-  const popoverId = `adjustment#${props.row.original.id}`;
-  const popoverAnchorName = `--anchor-adjustment#${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.delete'>
-            <Button
-              onClick={() => {
-                deleteClickHandler();
-                closePopover();
-              }}
-              variant='ghost'
-              color='error'
-              className='p-3 justify-start text-sm font-semibold w-full focus-visible:text-error-content hover:text-error-content'
-            >
-              <Icon icon='mdi:delete-outline' width={20} height={20} />
-              Delete
-            </Button>
-          </RequirePermission>
-        </div>
-      </PopoverContent>
-    </div>
-  );
-};
 
 const InventoryAdjustmentTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
     setPage,
     setPageSize,
     toQueryString: getTableFilterQueryString,
-  } = useTableFilter<{
-    search: string;
-    productCategorySort: string;
-    productSort: string;
-    warehouseSort: string;
-    stockSort: string;
-    productFilter?: OptionType<string>;
-    warehouseFilter?: OptionType<string>;
-    transactionTypeFilter?: OptionType<string>;
-  }>({
+  } = useTableFilter({
     initial: {
       search: '',
       productCategorySort: '',
       productSort: '',
       warehouseSort: '',
       stockSort: '',
-      productFilter: undefined,
-      warehouseFilter: undefined,
-      transactionTypeFilter: undefined,
+      productFilter: '',
+      warehouseFilter: '',
+      transactionTypeFilter: '',
     },
     paramMap: {
       page: 'page',
@@ -135,8 +71,6 @@ const InventoryAdjustmentTable = () => {
       warehouseFilter: 'warehouse_id',
       transactionTypeFilter: 'transaction_type',
     },
-    persist: true,
-    storeName: 'inventory-adjustment-table',
   });
 
   // ===== FILTER MODAL STATE =====
@@ -145,27 +79,22 @@ const InventoryAdjustmentTable = () => {
   // ===== FORMIK SETUP =====
   const formik = useFormik<AdjustmentFilterType>({
     initialValues: {
-      product: tableFilterState.productFilter,
-      warehouse: tableFilterState.warehouseFilter,
-      transaction_type: tableFilterState.transactionTypeFilter,
+      product_id: null,
+      warehouse_id: null,
+      transaction_type: null,
     },
     validationSchema: AdjustmentFilterSchema,
     onSubmit: (values, { setSubmitting }) => {
-      updateFilter('productFilter', values.product || undefined, true);
-      updateFilter('warehouseFilter', values.warehouse || undefined, true);
-      updateFilter(
-        'transactionTypeFilter',
-        values.transaction_type || undefined,
-        true
-      );
+      updateFilter('productFilter', values.product_id || '');
+      updateFilter('warehouseFilter', values.warehouse_id || '');
+      updateFilter('transactionTypeFilter', values.transaction_type || '');
       filterModal.closeModal();
       setSubmitting(false);
     },
     onReset: () => {
-      updateFilter('productFilter', undefined, true);
-      updateFilter('warehouseFilter', undefined, true);
-      updateFilter('transactionTypeFilter', undefined, true);
-      filterModal.closeModal();
+      updateFilter('productFilter', '');
+      updateFilter('warehouseFilter', '');
+      updateFilter('transactionTypeFilter', '');
     },
   });
 
@@ -204,68 +133,85 @@ const InventoryAdjustmentTable = () => {
   }, []);
 
   // ===== FILTER HANDLERS =====
-  const handleFilterProductChange = (val: OptionType | OptionType[] | null) => {
-    formik.setFieldValue('product', val);
-  };
+  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 = (
-    val: OptionType | OptionType[] | null
-  ) => {
-    formik.setFieldValue('warehouse', val);
-  };
+  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 = (
-    val: OptionType | OptionType[] | null
-  ) => {
-    formik.setFieldValue('transaction_type', val);
-  };
+  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 = () => {
-    formik.setValues({
-      product: tableFilterState.productFilter ?? undefined,
-      warehouse: tableFilterState.warehouseFilter ?? undefined,
-      transaction_type: tableFilterState.transactionTypeFilter ?? undefined,
-    });
     filterModal.openModal();
+    formik.validateForm();
   };
 
-  const {
-    data: inventoryAdjustments,
-    isLoading,
-    mutate: refreshAdjustments,
-  } = useSWR(
+  const { data: inventoryAdjustments, isLoading } = useSWR(
     `${InventoryAdjustmentApi.basePath}${getTableFilterQueryString()}`,
     InventoryAdjustmentApi.getAllFetcher
   );
 
-  const singleDeleteHandler = async () => {
-    setIsDeleteLoading(true);
-
-    const response = await InventoryAdjustmentApi.delete(
-      selectedAdjustment?.id as number
-    );
-
-    singleDeleteModal.closeModal();
-    setIsDeleteLoading(false);
-
-    if (isResponseSuccess(response)) {
-      toast.success(response?.message || 'Successfully delete Adjustment!');
-      refreshAdjustments();
-    } else {
-      toast.error(response?.message || 'Failed to delete Adjustment');
-    }
-  };
-
   const [sorting, setSorting] = useState<SortingState>([]);
-  const [selectedAdjustment, setSelectedAdjustment] = useState<
-    InventoryAdjustment | undefined
-  >(undefined);
-  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
-  const singleDeleteModal = useModal();
+
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('inventory-adjustment-table', pathname);
+  }, [pathname, setTableState]);
 
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const inventoryAdjustmentsColumns: ColumnDef<InventoryAdjustment>[] = useMemo(
@@ -368,39 +314,8 @@ const InventoryAdjustmentTable = () => {
         header: 'Oleh',
         accessorFn: (row) => row.created_user?.name ?? '-',
       },
-      {
-        id: 'actions',
-        header: 'Aksi',
-        cell: (props: CellContext<InventoryAdjustment, 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 = () => {
-            setSelectedAdjustment(props.row.original);
-            singleDeleteModal.openModal();
-          };
-
-          return (
-            <RowOptionsMenu
-              props={props}
-              deleteClickHandler={deleteClickHandler}
-              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
-            />
-          );
-        },
-      },
     ],
-    [
-      tableFilterState.pageSize,
-      tableFilterState.page,
-      singleDeleteModal,
-      setSelectedAdjustment,
-    ]
+    []
   );
 
   const updateSortingFilter = useCallback(
@@ -486,8 +401,6 @@ const InventoryAdjustmentTable = () => {
                 'productSort',
                 'warehouseSort',
                 'stockSort',
-                'productName',
-                'warehouseName',
               ]}
               onClick={handleFilterModalOpen}
               className='px-3 py-2.5'
@@ -577,7 +490,7 @@ const InventoryAdjustmentTable = () => {
               label='Produk'
               placeholder='Pilih Produk'
               options={productOptions}
-              value={formik.values.product}
+              value={productIdValue}
               onChange={handleFilterProductChange}
               onInputChange={setProductInputValue}
               isLoading={isLoadingProductOptions}
@@ -589,7 +502,7 @@ const InventoryAdjustmentTable = () => {
               label='Gudang'
               placeholder='Pilih Gudang'
               options={warehouseOptions}
-              value={formik.values.warehouse}
+              value={warehouseIdValue}
               onChange={handleFilterWarehouseChange}
               onInputChange={setWarehouseInputValue}
               isLoading={isLoadingWarehouseOptions}
@@ -601,7 +514,7 @@ const InventoryAdjustmentTable = () => {
               label='Tipe Transaksi'
               placeholder='Pilih Tipe Transaksi'
               options={transactionTypeOptions}
-              value={formik.values.transaction_type}
+              value={transactionTypeValue}
               onChange={handleFilterTransactionTypeChange}
               isClearable
               className={{ wrapper: 'w-full' }}
@@ -611,9 +524,13 @@ const InventoryAdjustmentTable = () => {
           {/* 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'
+              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>
@@ -627,21 +544,6 @@ const InventoryAdjustmentTable = () => {
           </div>
         </form>
       </Modal>
-
-      <ConfirmationModal
-        ref={singleDeleteModal.ref}
-        type='error'
-        text={`Apakah anda yakin ingin menghapus data Adjustment ini?`}
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          color: 'error',
-          isLoading: isDeleteLoading,
-          onClick: singleDeleteHandler,
-        }}
-      />
     </>
   );
 };

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

@@ -1,23 +1,13 @@
-import { OptionType } from '@/components/input/SelectInput';
-import * as Yup from 'yup';
+import { string, object } from 'yup';
 
-export const AdjustmentFilterSchema = Yup.object().shape({
-  product: Yup.object({
-    value: Yup.string().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
-  warehouse: Yup.object({
-    value: Yup.string().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
-  transaction_type: Yup.object({
-    value: Yup.string().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
+export const AdjustmentFilterSchema = object().shape({
+  product_id: string().nullable(),
+  warehouse_id: string().nullable(),
+  transaction_type: string().nullable(),
 });
 
 export type AdjustmentFilterType = {
-  product?: OptionType<string>;
-  warehouse?: OptionType<string>;
-  transaction_type?: OptionType<string>;
+  product_id: string | null;
+  warehouse_id: string | null;
+  transaction_type: string | null;
 };

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

@@ -15,7 +15,7 @@ import {
   InventoryAdjustmentFormSchema,
   InventoryAdjustmentFormValues,
 } from '@/components/pages/inventory/adjustment/form/InventoryAdjustmentForm.schema';
-import { LocationApi } from '@/services/api/master-data';
+import { KandangApi, LocationApi } from '@/services/api/master-data';
 import {
   ProjectFlockApi,
   ProjectFlockKandangApi,
@@ -32,6 +32,8 @@ import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 import AlertErrorList from '@/components/helper/form/FormErrors';
 import { Location } from '@/types/api/master-data/location';
 import { ProjectFlock } from '@/types/api/production/project-flock';
+import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
+import { Kandang } from '@/types/api/master-data/kandang';
 import { Product } from '@/types/api/master-data/product';
 import { ProjectFlockKandangLookup } from '@/types/api/production/project-flock';
 import { BaseApiResponse } from '@/types/api/api-general';
@@ -117,19 +119,40 @@ const InventoryAdjustmentForm = ({
     }
   );
 
+  const { rawData: approvedProjectFlockKandangsRawData } =
+    useSelect<ProjectFlockKandang>(
+      ProjectFlockKandangApi.basePath,
+      'id',
+      'id',
+      'search',
+      {
+        step_name: 'Disetujui',
+        limit: '100',
+      }
+    );
+
+  const approvedProjectFlockKandangs = useMemo(() => {
+    if (
+      approvedProjectFlockKandangsRawData &&
+      'data' in approvedProjectFlockKandangsRawData
+    ) {
+      return approvedProjectFlockKandangsRawData.data as ProjectFlockKandang[];
+    }
+    return [];
+  }, [approvedProjectFlockKandangsRawData]);
+
   const {
-    options: projectFlockKandangOptions,
-    loadMore: loadMoreProjectFlockKandangs,
-    setInputValue: setProjectFlockKandangInputValue,
-    isLoadingOptions: isLoadingProjectFlockKandangOptions,
-  } = useSelect(
-    selectedProjectFlock ? ProjectFlockKandangApi.basePath : '',
-    'kandang.id',
-    'kandang.name',
+    setInputValue: setKandangInputValue,
+    options: kandangOptionsFromApi,
+    isLoadingOptions: isLoadingKandangOptions,
+    loadMore: loadMoreKandangs,
+  } = useSelect<Kandang>(
+    selectedProjectFlock ? KandangApi.basePath : '',
+    'id',
+    'name',
     'search',
     {
-      step_name: 'Disetujui',
-      project_flock_id: String(selectedProjectFlock?.value),
+      location_id: selectedProjectFlockLocationId,
     }
   );
 
@@ -162,9 +185,7 @@ const InventoryAdjustmentForm = ({
     isLoadingOptions: isLoadingProductOptions,
     loadMore: loadMoreProducts,
     rawData: products,
-  } = useSelect<Product>(ProductApi.basePath, 'id', 'name', 'search', {
-    include_all: 'true',
-  });
+  } = useSelect<Product>(ProductApi.basePath, 'id', 'name', 'search');
 
   const {
     setInputValue: setDepletionProductInputValue,
@@ -199,6 +220,26 @@ const InventoryAdjustmentForm = ({
     return (product?.flags as string[]) || [];
   }, [selectedProduct, productOptions]);
 
+  const kandangOptions = useMemo(() => {
+    let options: OptionType[] = [];
+
+    if (selectedProjectFlock) {
+      const approvedKandangIds = approvedProjectFlockKandangs
+        .filter((pfk) => pfk.project_flock_id === selectedProjectFlock.value)
+        .map((pfk) => pfk.kandang_id);
+
+      options = kandangOptionsFromApi.filter((kandang) =>
+        approvedKandangIds.includes(kandang.value as number)
+      );
+    }
+
+    return options;
+  }, [
+    selectedProjectFlock,
+    kandangOptionsFromApi,
+    approvedProjectFlockKandangs,
+  ]);
+
   const formikInitialValues = useMemo<Partial<InventoryAdjustmentFormValues>>(
     () => ({
       location: null,
@@ -650,10 +691,10 @@ const InventoryAdjustmentForm = ({
                 label='Kandang'
                 value={selectedKandang}
                 onChange={kandangChangeHandler}
-                onInputChange={setProjectFlockKandangInputValue}
-                options={projectFlockKandangOptions}
-                onMenuScrollToBottom={loadMoreProjectFlockKandangs}
-                isLoading={isLoadingProjectFlockKandangOptions}
+                onInputChange={setKandangInputValue}
+                options={kandangOptions}
+                onMenuScrollToBottom={loadMoreKandangs}
+                isLoading={isLoadingKandangOptions}
                 isError={
                   formik.touched.kandang_id && Boolean(formik.errors.kandang_id)
                 }

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

@@ -1,6 +1,13 @@
 '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';
@@ -13,8 +20,7 @@ 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 ConfirmationModal from '@/components/modal/ConfirmationModal';
-import toast from 'react-hot-toast';
+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';
@@ -35,11 +41,9 @@ import {
 const RowOptionsMenu = ({
   popoverPosition = 'bottom',
   props,
-  deleteClickHandler,
 }: {
   popoverPosition: 'bottom' | 'top';
   props: CellContext<Movement, unknown>;
-  deleteClickHandler: () => void;
 }) => {
   const popoverId = `movement#${props.row.original.id}`;
   const popoverAnchorName = `--anchor-movement#${props.row.original.id}`;
@@ -79,20 +83,6 @@ const RowOptionsMenu = ({
               Detail
             </Button>
           </RequirePermission>
-          <RequirePermission permissions='lti.inventory.transfer.delete'>
-            <Button
-              onClick={() => {
-                deleteClickHandler();
-                closePopover();
-              }}
-              variant='ghost'
-              color='error'
-              className='p-3 justify-start text-sm font-semibold w-full focus-visible:text-error-content hover:text-error-content'
-            >
-              <Icon icon='mdi:delete-outline' width={20} height={20} />
-              Delete
-            </Button>
-          </RequirePermission>
         </div>
       </PopoverContent>
     </div>
@@ -100,21 +90,20 @@ const RowOptionsMenu = ({
 };
 
 const MovementTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
     setPage,
     setPageSize,
     toQueryString: getTableFilterQueryString,
-  } = useTableFilter<{
-    search: string;
-    productFilter?: OptionType<string>;
-    warehouseFilter?: OptionType<string>;
-  }>({
+  } = useTableFilter({
     initial: {
       search: '',
-      productFilter: undefined,
-      warehouseFilter: undefined,
+      productFilter: '',
+      warehouseFilter: '',
     },
     paramMap: {
       page: 'page',
@@ -122,8 +111,6 @@ const MovementTable = () => {
       productFilter: 'product_id',
       warehouseFilter: 'warehouse_id',
     },
-    persist: true,
-    storeName: 'movement-table',
   });
 
   // ===== FILTER MODAL STATE =====
@@ -132,20 +119,19 @@ const MovementTable = () => {
   // ===== FORMIK SETUP =====
   const formik = useFormik<MovementFilterType>({
     initialValues: {
-      product: tableFilterState.productFilter,
-      warehouse: tableFilterState.warehouseFilter,
+      product_id: null,
+      warehouse_id: null,
     },
     validationSchema: MovementFilterSchema,
     onSubmit: (values, { setSubmitting }) => {
-      updateFilter('productFilter', values.product || undefined, true);
-      updateFilter('warehouseFilter', values.warehouse || undefined, true);
+      updateFilter('productFilter', values.product_id || '');
+      updateFilter('warehouseFilter', values.warehouse_id || '');
       filterModal.closeModal();
       setSubmitting(false);
     },
     onReset: () => {
-      updateFilter('productFilter', undefined, true);
-      updateFilter('warehouseFilter', undefined, true);
-      filterModal.closeModal();
+      updateFilter('productFilter', '');
+      updateFilter('warehouseFilter', '');
     },
   });
 
@@ -176,59 +162,67 @@ const MovementTable = () => {
   );
 
   // ===== FILTER HANDLERS =====
-  const handleFilterProductChange = (val: OptionType | OptionType[] | null) => {
-    formik.setFieldValue('product', val);
-  };
+  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 = (
-    val: OptionType | OptionType[] | null
-  ) => {
-    formik.setFieldValue('warehouse', val);
-  };
+  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 = () => {
-    formik.setValues({
-      product: tableFilterState.productFilter ?? undefined,
-      warehouse: tableFilterState.warehouseFilter ?? undefined,
-    });
     filterModal.openModal();
+    formik.validateForm();
   };
 
   const [sorting, setSorting] = useState<SortingState>([]);
-  const [selectedMovement, setSelectedMovement] = useState<
-    Movement | undefined
-  >(undefined);
-  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
-  const singleDeleteModal = useModal();
 
-  const {
-    data: movements,
-    isLoading,
-    mutate: refreshMovements,
-  } = useSWR(
+  const { data: movements, isLoading } = useSWR(
     `${MovementApi.basePath}${getTableFilterQueryString()}`,
     MovementApi.getAllFetcher
   );
 
-  const singleDeleteHandler = async () => {
-    setIsDeleteLoading(true);
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
 
-    const response = await MovementApi.delete(selectedMovement?.id as number);
-
-    singleDeleteModal.closeModal();
-    setIsDeleteLoading(false);
-
-    if (isResponseSuccess(response)) {
-      toast.success(response?.message || 'Successfully delete Movement!');
-      refreshMovements();
-    } else {
-      toast.error(response?.message || 'Failed to delete Movement');
-    }
-  };
+  useEffect(() => {
+    setTableState('movement-table', pathname);
+  }, [pathname, setTableState]);
 
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const movementColumns: ColumnDef<Movement>[] = useMemo(
@@ -281,27 +275,16 @@ const MovementTable = () => {
 
           const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
 
-          const deleteClickHandler = () => {
-            setSelectedMovement(props.row.original);
-            singleDeleteModal.openModal();
-          };
-
           return (
             <RowOptionsMenu
               props={props}
-              deleteClickHandler={deleteClickHandler}
               popoverPosition={isLast2Rows ? 'top' : 'bottom'}
             />
           );
         },
       },
     ],
-    [
-      tableFilterState.pageSize,
-      tableFilterState.page,
-      singleDeleteModal,
-      setSelectedMovement,
-    ]
+    [tableFilterState.pageSize, tableFilterState.page]
   );
 
   return (
@@ -427,7 +410,7 @@ const MovementTable = () => {
               label='Produk'
               placeholder='Pilih Produk'
               options={productOptions}
-              value={formik.values.product}
+              value={productIdValue}
               onChange={handleFilterProductChange}
               onInputChange={setProductInputValue}
               isLoading={isLoadingProductOptions}
@@ -439,7 +422,7 @@ const MovementTable = () => {
               label='Gudang'
               placeholder='Pilih Gudang'
               options={warehouseOptions}
-              value={formik.values.warehouse}
+              value={warehouseIdValue}
               onChange={handleFilterWarehouseChange}
               onInputChange={setWarehouseInputValue}
               isLoading={isLoadingWarehouseOptions}
@@ -452,9 +435,13 @@ const MovementTable = () => {
           {/* 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'
+              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>
@@ -468,21 +455,6 @@ const MovementTable = () => {
           </div>
         </form>
       </Modal>
-
-      <ConfirmationModal
-        ref={singleDeleteModal.ref}
-        type='error'
-        text={`Apakah anda yakin ingin menghapus data Movement ini?`}
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          color: 'error',
-          isLoading: isDeleteLoading,
-          onClick: singleDeleteHandler,
-        }}
-      />
     </>
   );
 };

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

@@ -1,18 +1,11 @@
-import { OptionType } from '@/components/input/SelectInput';
-import * as Yup from 'yup';
+import { string, object } from 'yup';
 
-export const MovementFilterSchema = Yup.object().shape({
-  product: Yup.object({
-    value: Yup.string().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
-  warehouse: Yup.object({
-    value: Yup.string().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
+export const MovementFilterSchema = object().shape({
+  product_id: string().nullable(),
+  warehouse_id: string().nullable(),
 });
 
 export type MovementFilterType = {
-  product?: OptionType<string>;
-  warehouse?: OptionType<string>;
+  product_id: string | null;
+  warehouse_id: string | null;
 };

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

@@ -82,7 +82,6 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
     warehouse_id: number;
     warehouse_name: string;
     quantity: number;
-    transfer_available_qty?: number;
   }
 
   // ===== USE SELECT HOOKS =====
@@ -324,6 +323,8 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
     },
   });
 
+  const { setFieldValue, setFieldTouched, setFieldError } = formik;
+
   const prevSourceWarehouseIdRef = useRef<number | null>(
     formik.values.source_warehouse_id
   );
@@ -337,14 +338,14 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       prevSourceWarehouseId !== currentSourceWarehouseId &&
       prevSourceWarehouseId !== null
     ) {
-      formik.setFieldValue('products', [
+      setFieldValue('products', [
         {
           product: null,
           product_id: 0,
           product_qty: '',
         },
       ]);
-      formik.setFieldTouched('products', false);
+      setFieldTouched('products', false);
 
       const updatedDeliveries = formik.values.deliveries.map(
         (delivery: DeliverySchema) => ({
@@ -358,12 +359,17 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
           ],
         })
       );
-      formik.setFieldValue('deliveries', updatedDeliveries);
-      formik.setFieldTouched('deliveries', false);
+      setFieldValue('deliveries', updatedDeliveries);
+      setFieldTouched('deliveries', false);
     }
 
     prevSourceWarehouseIdRef.current = currentSourceWarehouseId;
-  }, [formik.values.source_warehouse_id, formik.values.deliveries]);
+  }, [
+    formik.values.source_warehouse_id,
+    formik.values.deliveries,
+    setFieldValue,
+    setFieldTouched,
+  ]);
 
   // ===== PRODUCT WAREHOUSE FETCHING (after form initialization) =====
   const {
@@ -380,8 +386,6 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       warehouse_id: formik.values.source_warehouse_id
         ? formik.values.source_warehouse_id.toString()
         : '',
-      transfer_context: 'inventory_transfer',
-      stock_mode: 'exclude_chickin',
     }
   );
 
@@ -394,7 +398,6 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
           warehouse_id: pw.warehouse.id,
           warehouse_name: pw.warehouse.name,
           quantity: pw.quantity,
-          transfer_available_qty: pw.transfer_available_qty,
         }))
       : [];
   }, [productWarehouses]);
@@ -459,9 +462,9 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
   // ===== EVENT HANDLERS =====
   const handleTransferDateChange = useCallback(
     (e: React.ChangeEvent<HTMLInputElement>) => {
-      formik.setFieldValue('transfer_date', e.target.value);
+      setFieldValue('transfer_date', e.target.value);
     },
-    []
+    [setFieldValue]
   );
 
   const handleSourceWarehouseChange = useCallback(
@@ -481,14 +484,16 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
         return;
       }
 
-      formik.setFieldTouched('source_warehouse', true);
-      formik.setFieldValue('source_warehouse', val);
-      formik.setFieldTouched('source_warehouse_id', true);
-      formik.setFieldValue('source_warehouse_id', newSourceWarehouseId);
+      setFieldTouched('source_warehouse', true);
+      setFieldValue('source_warehouse', val);
+      setFieldTouched('source_warehouse_id', true);
+      setFieldValue('source_warehouse_id', newSourceWarehouseId);
     },
     [
       formik.values.destination_warehouse_id,
       formik.values.destination_warehouse,
+      setFieldTouched,
+      setFieldValue,
     ]
   );
 
@@ -509,15 +514,17 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
         return;
       }
 
-      formik.setFieldTouched('destination_warehouse', true);
-      formik.setFieldValue('destination_warehouse', val);
-      formik.setFieldTouched('destination_warehouse_id', true);
-      formik.setFieldValue(
-        'destination_warehouse_id',
-        newDestinationWarehouseId
-      );
+      setFieldTouched('destination_warehouse', true);
+      setFieldValue('destination_warehouse', val);
+      setFieldTouched('destination_warehouse_id', true);
+      setFieldValue('destination_warehouse_id', newDestinationWarehouseId);
     },
-    [formik.values.source_warehouse_id, formik.values.source_warehouse]
+    [
+      formik.values.source_warehouse_id,
+      formik.values.source_warehouse,
+      setFieldTouched,
+      setFieldValue,
+    ]
   );
 
   const addProduct = useCallback(() => {
@@ -529,15 +536,15 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
         product_qty: '',
       },
     ];
-    formik.setFieldValue('products', newProducts);
-  }, [formik.values.products]);
+    setFieldValue('products', newProducts);
+  }, [formik.values.products, setFieldValue]);
 
   const removeProduct = useCallback(
     (i: number) => {
       const updatedProducts = formik.values.products?.filter(
         (_, idx) => idx !== i
       );
-      formik.setFieldValue('products', updatedProducts);
+      setFieldValue('products', updatedProducts);
 
       setSelectedProducts([]);
 
@@ -546,7 +553,12 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
         setProductQtyErrorShown(false);
       }
     },
-    [formik.values.products, productQtyErrorShown, setSelectedProducts]
+    [
+      formik.values.products,
+      productQtyErrorShown,
+      setSelectedProducts,
+      setFieldValue,
+    ]
   );
 
   const bulkRemoveProduct = useCallback(() => {
@@ -554,26 +566,32 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       formik.values.products?.filter(
         (_, idx) => !selectedProducts.includes(idx)
       ) ?? [];
-    formik.setFieldValue('products', updatedProducts);
+    setFieldValue('products', updatedProducts);
     setSelectedProducts([]);
 
     if (productQtyErrorShown) {
       toast.dismiss();
       setProductQtyErrorShown(false);
     }
-  }, [formik, selectedProducts, setSelectedProducts, productQtyErrorShown]);
+  }, [
+    selectedProducts,
+    setSelectedProducts,
+    productQtyErrorShown,
+    setFieldValue,
+    formik.values.products,
+  ]);
 
   const handleProductChange = useCallback(
     (idx: number, val: OptionType | OptionType[] | null) => {
-      formik.setFieldTouched(`products.${idx}.product`, true);
-      formik.setFieldValue(`products.${idx}.product`, val);
-      formik.setFieldTouched(`products.${idx}.product_id`, true);
-      formik.setFieldValue(
+      setFieldTouched(`products.${idx}.product`, true);
+      setFieldValue(`products.${idx}.product`, val);
+      setFieldTouched(`products.${idx}.product_id`, true);
+      setFieldValue(
         `products.${idx}.product_id`,
         (val as ProductWarehouseOptionType)?.value
       );
     },
-    []
+    [setFieldTouched, setFieldValue]
   );
 
   const handleProductSelectAllChange = useCallback(
@@ -600,7 +618,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
   );
 
   const addDelivery = useCallback(() => {
-    formik.setFieldValue('deliveries', [
+    setFieldValue('deliveries', [
       ...(formik.values.deliveries || []),
       {
         delivery_cost: '',
@@ -619,14 +637,14 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
         ],
       },
     ]);
-  }, [formik.values.deliveries]);
+  }, [formik.values.deliveries, setFieldValue]);
 
   const removeDelivery = useCallback(
     (i: number) => {
       const updatedDeliveries = formik.values.deliveries?.filter(
         (_, idx) => idx !== i
       );
-      formik.setFieldValue('deliveries', updatedDeliveries);
+      setFieldValue('deliveries', updatedDeliveries);
 
       setSelectedDeliveries([]);
 
@@ -635,7 +653,12 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
         setDeliveryQtyErrorShown(false);
       }
     },
-    [formik.values.deliveries, deliveryQtyErrorShown, setSelectedDeliveries]
+    [
+      formik.values.deliveries,
+      deliveryQtyErrorShown,
+      setSelectedDeliveries,
+      setFieldValue,
+    ]
   );
 
   const bulkRemoveDelivery = useCallback(() => {
@@ -643,7 +666,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       formik.values.deliveries?.filter(
         (_, idx) => !selectedDeliveries.includes(idx)
       ) ?? [];
-    formik.setFieldValue('deliveries', updatedDeliveries);
+    setFieldValue('deliveries', updatedDeliveries);
     setSelectedDeliveries([]);
 
     if (deliveryQtyErrorShown) {
@@ -651,10 +674,11 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       setDeliveryQtyErrorShown(false);
     }
   }, [
-    formik,
     selectedDeliveries,
     setSelectedDeliveries,
     deliveryQtyErrorShown,
+    setFieldValue,
+    formik.values.deliveries,
   ]);
 
   const handleDeliverySelectAllChange = useCallback(
@@ -684,34 +708,28 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
 
   const handleDeliveryProductChange = useCallback(
     (deliveryIdx: number, val: OptionType | OptionType[] | null) => {
-      formik.setFieldTouched(
-        `deliveries.${deliveryIdx}.products.0.product`,
-        true
-      );
-      formik.setFieldValue(`deliveries.${deliveryIdx}.products.0.product`, val);
-      formik.setFieldTouched(
-        `deliveries.${deliveryIdx}.products.0.product_id`,
-        true
-      );
-      formik.setFieldValue(
+      setFieldTouched(`deliveries.${deliveryIdx}.products.0.product`, true);
+      setFieldValue(`deliveries.${deliveryIdx}.products.0.product`, val);
+      setFieldTouched(`deliveries.${deliveryIdx}.products.0.product_id`, true);
+      setFieldValue(
         `deliveries.${deliveryIdx}.products.0.product_id`,
         (val as OptionType)?.value
       );
     },
-    []
+    [setFieldTouched, setFieldValue]
   );
 
   const handleDeliverySupplierChange = useCallback(
     (deliveryIdx: number, val: OptionType | OptionType[] | null) => {
-      formik.setFieldTouched(`deliveries.${deliveryIdx}.supplier`, true);
-      formik.setFieldValue(`deliveries.${deliveryIdx}.supplier`, val);
-      formik.setFieldTouched(`deliveries.${deliveryIdx}.supplier_id`, true);
-      formik.setFieldValue(
+      setFieldTouched(`deliveries.${deliveryIdx}.supplier`, true);
+      setFieldValue(`deliveries.${deliveryIdx}.supplier`, val);
+      setFieldTouched(`deliveries.${deliveryIdx}.supplier_id`, true);
+      setFieldValue(
         `deliveries.${deliveryIdx}.supplier_id`,
         (val as OptionType)?.value
       );
     },
-    []
+    [setFieldTouched, setFieldValue]
   );
 
   const handleDeliveryDocumentChange = useCallback(
@@ -723,15 +741,15 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
           e.target.value = '';
           return;
         }
-        formik.setFieldValue(`deliveries.${deliveryIdx}.document`, file);
+        setFieldValue(`deliveries.${deliveryIdx}.document`, file);
       }
     },
-    []
+    [setFieldValue]
   );
 
   const handleDeliveryCostChange = useCallback(
     (idx: number, value: number) => {
-      formik.setFieldValue(`deliveries.${idx}.delivery_cost`, value);
+      setFieldValue(`deliveries.${idx}.delivery_cost`, value);
 
       const delivery = formik.values.deliveries?.[idx];
       if (delivery) {
@@ -741,21 +759,18 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
         );
         if (productQty > 0 && value > 0) {
           const perItem = value / productQty;
-          formik.setFieldValue(
-            `deliveries.${idx}.delivery_cost_per_item`,
-            perItem
-          );
+          setFieldValue(`deliveries.${idx}.delivery_cost_per_item`, perItem);
         } else if (value === 0) {
-          formik.setFieldValue(`deliveries.${idx}.delivery_cost_per_item`, 0);
+          setFieldValue(`deliveries.${idx}.delivery_cost_per_item`, 0);
         }
       }
     },
-    [formik.values.deliveries]
+    [formik.values.deliveries, setFieldValue]
   );
 
   const handleDeliveryCostPerItemChange = useCallback(
     (idx: number, value: number) => {
-      formik.setFieldValue(`deliveries.${idx}.delivery_cost_per_item`, value);
+      setFieldValue(`deliveries.${idx}.delivery_cost_per_item`, value);
 
       const delivery = formik.values.deliveries?.[idx];
       if (delivery) {
@@ -765,13 +780,13 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
         );
         if (productQty > 0 && value > 0) {
           const totalCost = value * productQty;
-          formik.setFieldValue(`deliveries.${idx}.delivery_cost`, totalCost);
+          setFieldValue(`deliveries.${idx}.delivery_cost`, totalCost);
         } else if (value === 0) {
-          formik.setFieldValue(`deliveries.${idx}.delivery_cost`, 0);
+          setFieldValue(`deliveries.${idx}.delivery_cost`, 0);
         }
       }
     },
-    [formik.values.deliveries]
+    [formik.values.deliveries, setFieldValue]
   );
 
   const handleDeliveryCostChangeWrapper = useCallback(
@@ -838,22 +853,6 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
   }, [formik.values.products, formik.values.deliveries]);
 
   const getAvailableStock = useCallback(
-    (productId: number) => {
-      if (type === 'detail') return 0;
-      const productWarehouse = productWarehouseOptions.find(
-        (pw) => pw.product_id === productId
-      );
-
-      return (
-        productWarehouse?.transfer_available_qty ??
-        productWarehouse?.quantity ??
-        0
-      );
-    },
-    [productWarehouseOptions, type]
-  );
-
-  const getTotalStock = useCallback(
     (productId: number) => {
       if (type === 'detail') return 0;
       const productWarehouse = productWarehouseOptions.find(
@@ -864,16 +863,6 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
     [productWarehouseOptions, type]
   );
 
-  const hasAvailableQty = useCallback(
-    (productId: number) => {
-      const productWarehouse = productWarehouseOptions.find(
-        (pw) => pw.product_id === productId
-      );
-      return productWarehouse?.transfer_available_qty !== undefined;
-    },
-    [productWarehouseOptions]
-  );
-
   const getProductQtyBottomLabel = useCallback(
     (productIdx: number) => {
       if (type === 'detail') return undefined;
@@ -881,31 +870,16 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       if (!product || !product.product_id) return undefined;
 
       const availableStock = getAvailableStock(product.product_id);
-      const totalStock = getTotalStock(product.product_id);
       const requestedQty = Number(product.product_qty) || 0;
       const remainingStock = availableStock - requestedQty;
-      const isAyamProduct = hasAvailableQty(product.product_id);
 
       if (requestedQty > 0) {
-        if (isAyamProduct) {
-          return `Sisa: ${formatNumber(remainingStock)} (Total: ${formatNumber(totalStock)})`;
-        }
         return `Sisa: ${formatNumber(remainingStock)}`;
       }
 
-      if (isAyamProduct) {
-        return `Tersedia: ${formatNumber(availableStock)} (Total: ${formatNumber(totalStock)})`;
-      }
-
       return `Tersedia: ${formatNumber(availableStock)}`;
     },
-    [
-      formik.values.products,
-      getAvailableStock,
-      getTotalStock,
-      hasAvailableQty,
-      type,
-    ]
+    [formik.values.products, getAvailableStock, type]
   );
 
   const getDeliveryProductQtyBottomLabel = useCallback(
@@ -967,26 +941,15 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       if (!product || !product.product_id) return null;
 
       const availableStock = getAvailableStock(product.product_id);
-      const totalStock = getTotalStock(product.product_id);
       const requestedQty = Number(product.product_qty) || 0;
-      const isAyamProduct = hasAvailableQty(product.product_id);
 
       if (requestedQty > availableStock) {
-        if (isAyamProduct) {
-          return `Qty melebihi stok tersedia! Maksimal: ${formatNumber(availableStock)} (Total: ${formatNumber(totalStock)}, terpakai untuk chickin: ${formatNumber(totalStock - availableStock)})`;
-        }
         return `Qty melebihi stok tersedia! Maksimal: ${formatNumber(availableStock)}`;
       }
 
       return null;
     },
-    [
-      formik.values.products,
-      getAvailableStock,
-      getTotalStock,
-      hasAvailableQty,
-      type,
-    ]
+    [formik.values.products, getAvailableStock, type]
   );
 
   const validateDeliveryQty = useCallback(
@@ -1100,12 +1063,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
               return !validateDeliveryQty(deliveryIdx, productIdx, qty);
             })
           ) ?? []),
-    [
-      formik.values.deliveries,
-      formik.values.products,
-      validateDeliveryQty,
-      type,
-    ]
+    [formik.values.deliveries, validateDeliveryQty, type]
   );
 
   const hasInvalidQty = useMemo(
@@ -1122,6 +1080,27 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
     );
   }, [formik.values.products, getProductQtyError, type]);
 
+  const deliveryCostDepString = useMemo(
+    () =>
+      formik.values.deliveries
+        ?.map((d, idx) => ({
+          idx,
+          productQty: d.products.reduce(
+            (sum, p) => sum + (parseInt(p.product_qty.toString()) || 0),
+            0
+          ),
+          deliveryCost: parseInt((d.delivery_cost || '').toString()) || 0,
+          deliveryCostPerItem:
+            parseInt((d.delivery_cost_per_item || '').toString()) || 0,
+        }))
+        .map(
+          (item) =>
+            `${item.idx}:${item.productQty}:${item.deliveryCost}:${item.deliveryCostPerItem}`
+        )
+        .join('|'),
+    [formik.values.deliveries]
+  );
+
   // ===== EFFECTS =====
   useEffect(() => {
     formik.values.deliveries?.forEach((delivery, idx) => {
@@ -1138,36 +1117,16 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       if (deliveryCost > 0 && productQty > 0) {
         const perItem = deliveryCost / productQty;
         if (Math.abs(deliveryCostPerItem - perItem) > 0.01) {
-          formik.setFieldValue(
-            `deliveries.${idx}.delivery_cost_per_item`,
-            perItem
-          );
+          setFieldValue(`deliveries.${idx}.delivery_cost_per_item`, perItem);
         }
       } else if (deliveryCostPerItem > 0 && productQty > 0) {
         const totalCost = deliveryCostPerItem * productQty;
         if (Math.abs(deliveryCost - totalCost) > 0.01) {
-          formik.setFieldValue(`deliveries.${idx}.delivery_cost`, totalCost);
+          setFieldValue(`deliveries.${idx}.delivery_cost`, totalCost);
         }
       }
     });
-  }, [
-    formik.values.deliveries
-      ?.map((d, idx) => ({
-        idx,
-        productQty: d.products.reduce(
-          (sum, p) => sum + (parseInt(p.product_qty.toString()) || 0),
-          0
-        ),
-        deliveryCost: parseInt((d.delivery_cost || '').toString()) || 0,
-        deliveryCostPerItem:
-          parseInt((d.delivery_cost_per_item || '').toString()) || 0,
-      }))
-      .map(
-        (item) =>
-          `${item.idx}:${item.productQty}:${item.deliveryCost}:${item.deliveryCostPerItem}`
-      )
-      .join('|'),
-  ]);
+  }, [deliveryCostDepString, setFieldValue, formik.values.deliveries]);
 
   useEffect(() => {
     if (
@@ -1177,7 +1136,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       !isInitialized
     ) {
       if (formik.values.products.length === 0) {
-        formik.setFieldValue('products', [
+        setFieldValue('products', [
           {
             product: null,
             product_id: 0,
@@ -1186,7 +1145,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
         ]);
       }
       if (formik.values.deliveries.length === 0) {
-        formik.setFieldValue('deliveries', [
+        setFieldValue('deliveries', [
           {
             delivery_cost: undefined,
             delivery_cost_per_item: undefined,
@@ -1208,7 +1167,14 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       }
       setIsInitialized(true);
     }
-  }, [formik.values.source_warehouse_id, isInitialized, type]);
+  }, [
+    formik.values.source_warehouse_id,
+    isInitialized,
+    type,
+    setFieldValue,
+    formik.values.products.length,
+    formik.values.deliveries.length,
+  ]);
 
   useEffect(() => {
     if (
@@ -1217,7 +1183,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       formik.values.source_warehouse_id ===
         formik.values.destination_warehouse_id
     ) {
-      formik.setFieldError(
+      setFieldError(
         'destination_warehouse_id',
         'Gudang tujuan tidak boleh sama dengan gudang asal!'
       );
@@ -1226,13 +1192,14 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
         formik.errors.destination_warehouse_id ===
         'Gudang tujuan tidak boleh sama dengan gudang asal!'
       ) {
-        formik.setFieldError('destination_warehouse_id', undefined);
+        setFieldError('destination_warehouse_id', undefined);
       }
     }
   }, [
     formik.values.source_warehouse_id,
     formik.values.destination_warehouse_id,
     formik.errors.destination_warehouse_id,
+    setFieldError,
   ]);
 
   useEffect(() => {
@@ -1268,29 +1235,37 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       );
 
       if (hasChanges) {
-        formik.setFieldValue('deliveries', updatedDeliveries);
+        setFieldValue('deliveries', updatedDeliveries);
       }
     }
-  }, [formik.values.products]);
+  }, [formik.values.products, formik.values.deliveries, setFieldValue]);
+
+  const productQtyDepString = useMemo(
+    () => formik.values.products?.map((p) => p.product_qty).join(','),
+    [formik.values.products]
+  );
 
   useEffect(() => {
     if (productQtyErrorShown) {
       toast.dismiss();
       setProductQtyErrorShown(false);
     }
-  }, [formik.values.products?.map((p) => p.product_qty).join(',')]);
+  }, [productQtyErrorShown]);
+
+  const deliveryProductQtyDepString = useMemo(
+    () =>
+      formik.values.deliveries
+        ?.map((d) => d.products.map((p) => p.product_qty).join(','))
+        .join('|'),
+    [formik.values.deliveries]
+  );
 
   useEffect(() => {
     if (deliveryQtyErrorShown) {
       toast.dismiss();
       setDeliveryQtyErrorShown(false);
     }
-  }, [
-    formik.values.deliveries
-      ?.map((d) => d.products.map((p) => p.product_qty).join(','))
-      .join('|'),
-    formik.values.products?.map((p) => p.product_qty).join(','),
-  ]);
+  }, [deliveryProductQtyDepString, productQtyDepString, deliveryQtyErrorShown]);
 
   useEffect(() => {
     if (hasExceededStock && !productQtyErrorShown && type !== 'detail') {

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

@@ -4,23 +4,17 @@ import Button from '@/components/Button';
 import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import Table from '@/components/Table';
 import RequirePermission from '@/components/helper/RequirePermission';
-import ButtonFilter from '@/components/helper/ButtonFilter';
-import Modal, { useModal } from '@/components/Modal';
-import SelectInput, { useSelect } from '@/components/input/SelectInput';
-import { OptionType } from '@/components/input/SelectInput';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { cn, formatCurrency, formatNumber } from '@/lib/helper';
 import { InventoryProductApi } from '@/services/api/inventory';
-import { ProductCategoryApi } from '@/services/api/master-data';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
+import { useUiStore } from '@/stores/ui/ui.store';
 import { InventoryProduct } from '@/types/api/inventory/product';
-import { ProductCategory } from '@/types/api/master-data/product-category';
 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 { useFormik } from 'formik';
-import * as Yup from 'yup';
 import PopoverButton from '@/components/popover/PopoverButton';
 import PopoverContent from '@/components/popover/PopoverContent';
 import InventoryProductTableSkeleton from '@/components/pages/inventory/product/skeleton/InventoryProductTableSkeleton';
@@ -77,79 +71,25 @@ const RowOptionsMenu = ({
 };
 
 const InventoryProductTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
     setPage,
     setPageSize,
     toQueryString: getTableFilterQueryString,
-  } = useTableFilter<{
-    search: string;
-    categoryFilter?: OptionType<string>;
-  }>({
+  } = useTableFilter({
     initial: {
       search: '',
-      categoryFilter: undefined,
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
-      categoryFilter: 'product_category_id',
-    },
-    persist: true,
-    storeName: 'inventory-product-table',
-  });
-
-  // ===== FILTER MODAL STATE =====
-  const filterModal = useModal();
-
-  // ===== FORMIK SETUP =====
-  const formik = useFormik<{ category?: OptionType<string> }>({
-    initialValues: { category: tableFilterState.categoryFilter },
-    validationSchema: Yup.object().shape({
-      category: Yup.object({
-        value: Yup.string().nullable(),
-        label: Yup.string().nullable(),
-      }).nullable(),
-    }),
-    onSubmit: (values, { setSubmitting }) => {
-      updateFilter('categoryFilter', values.category || undefined, true);
-      filterModal.closeModal();
-      setSubmitting(false);
-    },
-    onReset: () => {
-      updateFilter('categoryFilter', undefined, true);
-      filterModal.closeModal();
     },
   });
 
-  // ===== CATEGORY OPTIONS =====
-  const {
-    setInputValue: setCategoryInputValue,
-    options: categoryOptions,
-    isLoadingOptions: isLoadingCategoryOptions,
-    loadMore: loadMoreCategories,
-  } = useSelect<ProductCategory>(
-    filterModal.open ? ProductCategoryApi.basePath : null,
-    'id',
-    'name',
-    'search'
-  );
-
-  // ===== HANDLE FILTER MODAL OPEN =====
-  const handleFilterModalOpen = () => {
-    formik.setValues({
-      category: tableFilterState.categoryFilter ?? undefined,
-    });
-    filterModal.openModal();
-  };
-
-  const handleFilterCategoryChange = (
-    val: OptionType | OptionType[] | null
-  ) => {
-    formik.setFieldValue('category', val);
-  };
-
   const [sorting, setSorting] = useState<SortingState>([]);
 
   const { data: inventoryProducts, isLoading } = useSWR(
@@ -157,8 +97,17 @@ const InventoryProductTable = () => {
     InventoryProductApi.getAllFetcher
   );
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('inventory-product-table', pathname);
+  }, [pathname, setTableState]);
+
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const columns: ColumnDef<InventoryProduct>[] = useMemo(
@@ -233,163 +182,96 @@ const InventoryProductTable = () => {
   );
 
   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.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='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.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>
 
-          {/* 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={
+        {/* 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>
+        ) : !isResponseSuccess(inventoryProducts) ||
+          inventoryProducts.data?.length === 0 ? (
+          <div className='p-3'>
+            <InventoryProductTableSkeleton
+              columns={columns}
+              icon={
                 <Icon
-                  icon='heroicons:magnifying-glass'
+                  icon='heroicons:document-text'
+                  className='text-white'
                   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>
-        </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
-                  : []
-              }
-              columns={columns}
-              pageSize={tableFilterState.pageSize}
-              page={
-                isResponseSuccess(inventoryProducts)
-                  ? inventoryProducts?.meta?.page
-                  : 0
-              }
-              totalItems={
-                isResponseSuccess(inventoryProducts)
-                  ? inventoryProducts?.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<InventoryProduct>
+            data={
+              isResponseSuccess(inventoryProducts)
+                ? inventoryProducts?.data
+                : []
+            }
+            columns={columns}
+            pageSize={tableFilterState.pageSize}
+            page={
+              isResponseSuccess(inventoryProducts)
+                ? inventoryProducts?.meta?.page
+                : 0
+            }
+            totalItems={
+              isResponseSuccess(inventoryProducts)
+                ? inventoryProducts?.meta?.total_results
+                : 0
+            }
+            onPageChange={setPage}
+            onPageSizeChange={setPageSize}
+            isLoading={isLoading}
+            sorting={sorting}
+            setSorting={setSorting}
+            className={{
+              containerClassName: cn('p-3 mb-0'),
+              headerColumnClassName: 'text-nowrap',
+            }}
+          />
+        )}
       </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='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'
-              options={categoryOptions}
-              value={formik.values.category}
-              onChange={handleFilterCategoryChange}
-              onInputChange={setCategoryInputValue}
-              isLoading={isLoadingCategoryOptions}
-              isClearable
-              onMenuScrollToBottom={loadMoreCategories}
-              className={{ wrapper: 'w-full' }}
-            />
-          </div>
-          <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>
-    </>
+    </div>
   );
 };
 

src/components/pages/inventory/product/detail/InventoryProductDetail.tsx

@@ -1,16 +1,8 @@
-'use client';
-
 import Card from '@/components/Card';
-import { OptionType } from '@/components/input/SelectInput';
 import { FormHeader } from '@/components/helper/form/FormHeader';
-import ButtonFilter from '@/components/helper/ButtonFilter';
-import RequirePermission from '@/components/helper/RequirePermission';
-import { useModal } from '@/components/Modal';
-import StockLogFilterModal from '@/components/pages/inventory/product/detail/StockLogFilterModal';
 import StockLogTable from '@/components/pages/inventory/product/detail/StockLogTable';
 import StockProductWarehouseTable from '@/components/pages/inventory/product/detail/StockProductWarehouseTable';
 import { formatCurrency, formatNumber } from '@/lib/helper';
-import { useTableFilter } from '@/services/hooks/useTableFilter';
 import { InventoryProduct } from '@/types/api/inventory/product';
 import { useMemo } from 'react';
 
@@ -19,34 +11,17 @@ const InventoryProductDetail = ({
 }: {
   inventoryProduct?: InventoryProduct;
 }) => {
-  const filterModal = useModal();
-
-  const { state: filterState, updateFilter } = useTableFilter<{
-    warehouse_ids: OptionType<number>[];
-  }>({
-    initial: {
-      warehouse_ids: [],
-    },
-    persist: true,
-    storeName: 'inventory-product-stock-log-filter',
-  });
-
-  const filteredProductWarehouses = useMemo(() => {
-    const warehouses = inventoryProduct?.product_warehouses ?? [];
-    if (!filterState.warehouse_ids?.length) return warehouses;
-    const selectedIds = new Set(filterState.warehouse_ids.map((w) => w.value));
-    return warehouses.filter((pw) => selectedIds.has(pw.warehouse_id));
-  }, [inventoryProduct?.product_warehouses, filterState.warehouse_ids]);
-
-  const filterSubmitHandler = (values: {
-    warehouse_ids: OptionType<number>[];
-  }) => {
-    updateFilter('warehouse_ids', values.warehouse_ids, true);
-  };
-
-  const filterResetHandler = () => {
-    updateFilter('warehouse_ids', [], true);
-  };
+  const stockLogs = useMemo(() => {
+    return (
+      inventoryProduct?.product_warehouses?.flatMap((warehouse) =>
+        warehouse.stock_logs.map((log) => ({
+          ...log,
+          warehouse_name: warehouse.warehouse_name,
+          warehouse_id: warehouse.warehouse_id,
+        }))
+      ) || []
+    );
+  }, [inventoryProduct]);
 
   return (
     <div className='flex flex-col gap-4 p-4'>
@@ -139,29 +114,7 @@ const InventoryProductDetail = ({
         productWarehouseStock={inventoryProduct?.product_warehouses ?? []}
       />
 
-      <RequirePermission permissions={'lti.inventory.stock_log.list'}>
-        <div className='flex justify-end'>
-          <ButtonFilter
-            values={{ warehouse_ids: filterState.warehouse_ids }}
-            onClick={filterModal.openModal}
-            className='px-3 py-2.5'
-          />
-        </div>
-        {filteredProductWarehouses.map((productWarehouse) => (
-          <StockLogTable
-            key={productWarehouse.id}
-            productWarehouse={productWarehouse}
-          />
-        ))}
-      </RequirePermission>
-
-      <StockLogFilterModal
-        ref={filterModal.ref}
-        productWarehouses={inventoryProduct?.product_warehouses ?? []}
-        initialValues={{ warehouse_ids: filterState.warehouse_ids }}
-        onSubmit={filterSubmitHandler}
-        onReset={filterResetHandler}
-      />
+      <StockLogTable stockLogs={stockLogs} />
     </div>
   );
 };

src/components/pages/inventory/product/detail/StockLogFilterModal.tsx

@@ -1,115 +0,0 @@
-'use client';
-
-import Button from '@/components/Button';
-import SelectInputCheckbox from '@/components/input/SelectInputCheckbox';
-import { OptionType } from '@/components/input/SelectInput';
-import Modal from '@/components/Modal';
-import { ProductWarehouseStock } from '@/types/api/inventory/product';
-import { Icon } from '@iconify/react';
-import { useFormik } from 'formik';
-import { RefObject, useCallback } from 'react';
-
-interface StockLogFilterModalProps {
-  ref: RefObject<HTMLDialogElement | null>;
-  productWarehouses: ProductWarehouseStock[];
-  initialValues: {
-    warehouse_ids: OptionType<number>[];
-  };
-  onSubmit: (values: { warehouse_ids: OptionType<number>[] }) => void;
-  onReset: () => void;
-}
-
-const StockLogFilterModal = ({
-  ref,
-  productWarehouses,
-  initialValues,
-  onSubmit,
-  onReset,
-}: StockLogFilterModalProps) => {
-  const closeModalHandler = () => {
-    ref.current?.close();
-  };
-
-  const warehouseOptions: OptionType<number>[] = productWarehouses.map(
-    (pw) => ({
-      label: pw.warehouse_name,
-      value: pw.warehouse_id,
-    })
-  );
-
-  const formik = useFormik({
-    initialValues,
-    enableReinitialize: true,
-    onSubmit: (values) => {
-      onSubmit(values);
-      closeModalHandler();
-    },
-  });
-
-  const { resetForm } = formik;
-
-  const formikResetHandler = useCallback(() => {
-    resetForm({ values: { warehouse_ids: [] } });
-    onReset();
-    closeModalHandler();
-  }, [resetForm, onReset]);
-
-  return (
-    <Modal ref={ref} className={{ modalBox: 'p-0 rounded-xl' }}>
-      <form
-        onSubmit={formik.handleSubmit}
-        onReset={formikResetHandler}
-        className='w-full flex flex-col'
-      >
-        <div className='p-4 flex items-center justify-between gap-2 border-b border-gray-300'>
-          <div className='flex items-center gap-2 text-primary'>
-            <Icon icon='heroicons:funnel' width={20} height={20} />
-            <h3 className='text-sm font-medium'>Filter Stock Log</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>
-
-        <div className='p-4 flex flex-col gap-1.5'>
-          <SelectInputCheckbox
-            label='Gudang'
-            isClearable
-            placeholder='Pilih gudang'
-            options={warehouseOptions}
-            value={formik.values.warehouse_ids}
-            onChange={(val) =>
-              formik.setFieldValue('warehouse_ids', val as OptionType<number>[])
-            }
-            isMulti
-          />
-        </div>
-
-        <div className='p-4 flex justify-between gap-4 border-t border-gray-300 bg-gray-100'>
-          <Button
-            type='reset'
-            variant='ghost'
-            color='none'
-            className='p-3 rounded-lg text-base-content/65'
-          >
-            Reset Filter
-          </Button>
-          <Button
-            type='submit'
-            className='p-3 rounded-lg w-fit sm:w-full max-w-40 text-base-100 text-sm'
-          >
-            Apply Filter
-          </Button>
-        </div>
-      </form>
-    </Modal>
-  );
-};
-
-export default StockLogFilterModal;

src/components/pages/inventory/product/detail/StockLogTable.tsx

@@ -1,183 +1,95 @@
-import Button from '@/components/Button';
 import Card from '@/components/Card';
 import Table from '@/components/Table';
-import { isResponseSuccess } from '@/lib/api-helper';
 import { formatDate, formatNumber, formatTitleCase } from '@/lib/helper';
-import { StockLogApi } from '@/services/api/inventory';
-import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { ProductWarehouseStock, StockLog } from '@/types/api/inventory/product';
-import { ColumnDef } from '@tanstack/react-table';
-import { FileDown } from 'lucide-react';
-import toast from 'react-hot-toast';
-import { useEffect, useRef, useState } from 'react';
-import useSWR from 'swr';
-
-const stockLogTableColumns: (warehouseName: string) => ColumnDef<StockLog>[] = (
-  warehouseName
-) => [
-  {
-    header: 'ID',
-    accessorKey: 'id',
-  },
-  {
-    header: 'Tanggal',
-    accessorKey: 'created_at',
-    cell: (props) => {
-      return formatDate(props.row.original.created_at, 'DD-MMM-yyyy');
-    },
-  },
-  {
-    header: 'Gudang',
-    accessorKey: 'warehouse_name',
-    cell: warehouseName,
-  },
-  {
-    header: 'Stock Akhir',
-    accessorKey: 'stock',
-    cell: (props) => {
-      return formatNumber(props.row.original.stock);
-    },
-  },
-  {
-    header: 'Peningkatan',
-    accessorKey: 'increase',
-    cell: (props) => {
-      return formatNumber(props.row.original.increase);
-    },
-  },
-  {
-    header: 'Penurunan',
-    accessorKey: 'decrease',
-    cell: (props) => {
-      return formatNumber(props.row.original.decrease);
-    },
-  },
-  {
-    header: 'Jenis Transaksi',
-    accessorKey: 'loggable_type',
-    cell: (props) => {
-      return props.row.original.loggable_type
-        ? formatTitleCase(props.row.original.loggable_type)
-        : '-';
-    },
-  },
-  {
-    header: 'Catatan',
-    accessorKey: 'notes',
-    cell: (props) => {
-      return props.row.original.notes ? props.row.original.notes : '-';
-    },
-  },
-  {
-    header: 'Oleh',
-    accessorKey: 'created_user.name',
-  },
-];
+import { StockLog } from '@/types/api/inventory/product';
 
 const StockLogTable = ({
-  productWarehouse,
+  stockLogs,
 }: {
-  productWarehouse: ProductWarehouseStock;
+  stockLogs: (StockLog & { warehouse_name: string; warehouse_id: number })[];
 }) => {
-  const [isExportLoading, setIsExportLoading] = useState(false);
-  const [hasBeenVisible, setHasBeenVisible] = useState(false);
-  const containerRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    const observer = new IntersectionObserver(
-      ([entry]) => {
-        if (entry.isIntersecting) {
-          setHasBeenVisible(true);
-          observer.disconnect();
-        }
-      },
-      { threshold: 0.1 }
-    );
-
-    if (containerRef.current) observer.observe(containerRef.current);
-    return () => observer.disconnect();
-  }, []);
-
-  const {
-    state: tableFilterState,
-    setPage,
-    setPageSize,
-    toQueryString: getTableFilterQueryString,
-  } = useTableFilter({
-    initial: {
-      product_warehouse_id: productWarehouse.id,
-    },
-  });
-
-  const handleExportExcel = async () => {
-    setIsExportLoading(true);
-    try {
-      await StockLogApi.exportToExcel(
-        productWarehouse.warehouse_name,
-        getTableFilterQueryString()
-      );
-      toast.success('Excel berhasil dibuat dan diunduh.');
-    } catch {
-      toast.error('Gagal membuat Excel. Silakan coba lagi.');
-    } finally {
-      setIsExportLoading(false);
-    }
-  };
-
-  const { data: stockLogsResponse, isLoading: isLoadingStockLogs } = useSWR(
-    hasBeenVisible
-      ? `${StockLogApi.basePath}${getTableFilterQueryString()}`
-      : null,
-    StockLogApi.getAllFetcher
-  );
-
-  const stockLogs = isResponseSuccess(stockLogsResponse)
-    ? stockLogsResponse.data
-    : [];
-
   return (
-    <div ref={containerRef}>
-      <Card
-        title={`Informasi Stock Produk - ${productWarehouse.warehouse_name}`}
-        collapsible
-        variant='bordered'
+    <Card
+      title='Informasi Stock Produk'
+      collapsible
+      variant='bordered'
+      className={{
+        wrapper: 'w-full',
+      }}
+    >
+      <Table<StockLog>
+        data={stockLogs}
+        columns={[
+          {
+            header: 'ID',
+            accessorKey: 'id',
+          },
+          {
+            header: 'Tanggal',
+            accessorKey: 'created_at',
+            cell: (props) => {
+              return formatDate(props.row.original.created_at, 'DD-MMM-yyyy');
+            },
+          },
+          {
+            header: 'Gudang',
+            accessorKey: 'warehouse_name',
+          },
+          {
+            header: 'Stock Akhir',
+            accessorKey: 'stock',
+            cell: (props) => {
+              return formatNumber(props.row.original.stock);
+            },
+          },
+          {
+            header: 'Peningkatan',
+            accessorKey: 'increase',
+            cell: (props) => {
+              return formatNumber(props.row.original.increase);
+            },
+          },
+          {
+            header: 'Penurunan',
+            accessorKey: 'decrease',
+            cell: (props) => {
+              return formatNumber(props.row.original.decrease);
+            },
+          },
+          {
+            header: 'Jenis Transaksi',
+            accessorKey: 'loggable_type',
+            cell: (props) => {
+              return props.row.original.loggable_type
+                ? formatTitleCase(props.row.original.loggable_type)
+                : '-';
+            },
+          },
+          {
+            header: 'Catatan',
+            accessorKey: 'notes',
+            cell: (props) => {
+              return props.row.original.notes ? props.row.original.notes : '-';
+            },
+          },
+          {
+            header: 'Oleh',
+            accessorKey: 'created_user.name',
+          },
+        ]}
         className={{
-          wrapper: 'w-full',
+          containerClassName: 'mt-6',
+          tableWrapperClassName: 'overflow-x-auto min-h-full!',
+          tableClassName: 'font-inter w-full table-auto min-h-full!',
+          headerRowClassName: 'border-b border-b-gray-200',
+          headerColumnClassName:
+            'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
+          bodyRowClassName: 'border-b border-b-gray-200',
+          bodyColumnClassName:
+            'px-6 py-3 last:flex last:flex-row last:justify-end',
         }}
-      >
-        <div className='flex justify-end px-6 pt-4'>
-          <Button onClick={handleExportExcel} isLoading={isExportLoading}>
-            <FileDown size={16} />
-            Export Excel
-          </Button>
-        </div>
-        <Table<StockLog>
-          data={stockLogs}
-          columns={stockLogTableColumns(productWarehouse.warehouse_name)}
-          page={tableFilterState.page ?? 0}
-          pageSize={tableFilterState.pageSize}
-          onPageChange={setPage}
-          onPageSizeChange={setPageSize}
-          isLoading={isLoadingStockLogs}
-          totalItems={
-            isResponseSuccess(stockLogsResponse)
-              ? stockLogsResponse.meta?.total_results
-              : 0
-          }
-          className={{
-            containerClassName: 'mt-4 mb-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',
-          }}
-        />
-      </Card>
-    </div>
+      />
+    </Card>
   );
 };
 

src/components/pages/inventory/product/detail/StockProductWarehouseTable.tsx

@@ -1,42 +1,13 @@
 import Card from '@/components/Card';
 import Table from '@/components/Table';
 import { formatNumber } from '@/lib/helper';
-import { useTableFilter } from '@/services/hooks/useTableFilter';
 import { ProductWarehouseStock } from '@/types/api/inventory/product';
-import { ColumnDef } from '@tanstack/react-table';
-
-const stockProductWarehouseTableColumns: ColumnDef<ProductWarehouseStock>[] = [
-  {
-    header: 'Nama Gudang',
-    accessorKey: 'warehouse_name',
-  },
-  {
-    header: 'Lokasi',
-    accessorKey: 'location',
-    cell: (props) => {
-      return props.row.original.location != null
-        ? props.row.original.location.name
-        : '-';
-    },
-  },
-  {
-    header: 'Stok',
-    accessorFn(row) {
-      return row.current_stock;
-    },
-    cell: (props) => {
-      return formatNumber(props.row.original.current_stock);
-    },
-  },
-];
 
 const StockProductWarehouseTable = ({
   productWarehouseStock,
 }: {
   productWarehouseStock?: ProductWarehouseStock[];
 }) => {
-  const { state: tableFilterState, setPage, setPageSize } = useTableFilter();
-
   return (
     <Card
       title='Informasi Gudang'
@@ -48,14 +19,32 @@ const StockProductWarehouseTable = ({
     >
       <Table<ProductWarehouseStock>
         data={productWarehouseStock ?? []}
-        columns={stockProductWarehouseTableColumns}
-        pageSize={tableFilterState.pageSize}
-        page={tableFilterState.page ?? 0}
-        totalItems={productWarehouseStock?.length ?? 0}
-        onPageChange={setPage}
-        onPageSizeChange={setPageSize}
+        columns={[
+          {
+            header: 'Nama Gudang',
+            accessorKey: 'warehouse_name',
+          },
+          {
+            header: 'Lokasi',
+            accessorKey: 'location',
+            cell: (props) => {
+              return props.row.original.location != null
+                ? props.row.original.location.name
+                : '-';
+            },
+          },
+          {
+            header: 'Stok',
+            accessorFn(row) {
+              return row.current_stock;
+            },
+            cell: (props) => {
+              return formatNumber(props.row.original.current_stock);
+            },
+          },
+        ]}
         className={{
-          containerClassName: 'mt-6 mb-0',
+          containerClassName: 'mt-6',
           tableWrapperClassName: 'overflow-x-auto min-h-full!',
           tableClassName: 'font-inter w-full table-auto min-h-full!',
           headerRowClassName: 'border-b border-b-gray-200',

src/components/pages/marketing/DeliveryOrderFormModal.tsx

@@ -199,9 +199,6 @@ const DeliveryOrderFormModal = ({}: { initialValues?: Marketing }) => {
                   'yyyy-MM-DD'
                 ),
                 vehicle_number: product.vehicle_number,
-                weight_per_convertion: parseFloat(
-                  String(product.weight_per_convertion ?? 0)
-                ),
               };
             }
           })
@@ -371,9 +368,7 @@ const DeliveryOrderFormModal = ({}: { initialValues?: Marketing }) => {
       const currentProducts = deliveryOrderValues?.find(
         (product) => product.id == id
       );
-
-      setSelectedDeliveryProduct(currentProducts ?? values ?? null);
-
+      setSelectedDeliveryProduct(values ?? currentProducts ?? null);
       if (id) {
         setStep(2);
       }
@@ -435,9 +430,6 @@ const DeliveryOrderFormModal = ({}: { initialValues?: Marketing }) => {
                   'yyyy-MM-DD'
                 ),
                 vehicle_number: product.vehicle_number,
-                weight_per_convertion: parseFloat(
-                  String(product.weight_per_convertion ?? 0)
-                ),
               };
             }
           })
@@ -544,9 +536,13 @@ const DeliveryOrderFormModal = ({}: { initialValues?: Marketing }) => {
     formModal.closeModal();
   };
 
+  const hasLoadedInitialValues = useRef(false);
   useEffect(() => {
     const getFilledInitialValues = async () => {
       if (marketingId && isResponseSuccess(marketing)) {
+        if (hasLoadedInitialValues.current) return;
+        hasLoadedInitialValues.current = true;
+
         const filledInitialValues = await getFilledMarketingFormInitialValues(
           marketing.data
         );
@@ -590,9 +586,15 @@ const DeliveryOrderFormModal = ({}: { initialValues?: Marketing }) => {
     setFormErrorMessage('');
   }, [step]);
 
-  // sync delivery order values to formik
+  const prevDeliveryOrderValuesRef = useRef(deliveryOrderValues);
   useEffect(() => {
-    formik.setFieldValue('delivery_order', deliveryOrderValues);
+    if (
+      JSON.stringify(prevDeliveryOrderValuesRef.current) !==
+      JSON.stringify(deliveryOrderValues)
+    ) {
+      prevDeliveryOrderValuesRef.current = deliveryOrderValues;
+      formik.setFieldValue('delivery_order', deliveryOrderValues);
+    }
   }, [deliveryOrderValues]);
 
   const grandTotal = useMemo(() => {
@@ -849,11 +851,7 @@ const DeliveryOrderFormModal = ({}: { initialValues?: Marketing }) => {
                         className='p-3  shadow-button-soft text-base-100 rounded-lg text-sm font-semibold'
                         disabled={deliveryRejected}
                       >
-                        {marketing?.data?.latest_approval?.step_number === 1 &&
-                          'Approve'}
-
-                        {marketing?.data?.latest_approval?.step_number === 2 &&
-                          'Deliver Item'}
+                        Approve
                       </Button>
                     </div>
                   )}

src/components/pages/marketing/MarketingFilter.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { RefObject, useCallback, useMemo } from 'react';
+import { RefObject, useMemo } from 'react';
 import { useFormik } from 'formik';
 import { Icon } from '@iconify/react';
 import Modal from '@/components/Modal';
@@ -10,38 +10,22 @@ import SelectInput, {
   useSelect,
 } from '@/components/input/SelectInput';
 import { MARKETING_APPROVAL_LINE } from '@/config/approval-line';
-import {
-  MarketingFilterFormValues,
-  MarketingFilterSchema,
-} from '@/components/pages/marketing/filter/MarketingFilter';
 import { MarketingFilter } from '@/types/api/marketing/marketing';
 import SelectInputCheckbox from '@/components/input/SelectInputCheckbox';
 import { MarketingApi } from '@/services/api/marketing/marketing';
-import { CustomerApi, ProductApi } from '@/services/api/master-data';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { BaseMarketing, BaseSalesOrder } from '@/types/api/marketing/marketing';
-import { ProjectFlockApi } from '@/services/api/production';
-import { ProjectFlock } from '@/types/api/production/project-flock';
-import { Product } from '@/types/api/master-data/product';
 
 interface MarketingFilterModal {
   ref: RefObject<HTMLDialogElement | null>;
   onSubmit?: (values: MarketingFilter) => void;
   onReset?: () => void;
-  initialValues?: {
-    product_ids: OptionType<number>[];
-    status: OptionType<string> | null;
-    customer: OptionType<number> | null;
-    project_flock: OptionType<number> | null;
-    project_flock_kandang: OptionType<number> | null;
-  };
 }
 
 const MarketingFilterModal = ({
   ref,
   onSubmit,
   onReset,
-  initialValues,
 }: MarketingFilterModal) => {
   const closeModalHandler = () => {
     ref.current?.close();
@@ -49,35 +33,51 @@ const MarketingFilterModal = ({
 
   // ===== OPTIONS =====
   const {
-    options: productsOptions,
+    rawData: productsRawData,
     isLoadingOptions: isLoadingProductsOptions,
     setInputValue: setProductsInputValue,
     loadMore: loadMoreProducts,
-  } = useSelect<Product>(ProductApi.basePath, 'id', 'name', 'search', {
-    include_all: 'true',
+  } = useSelect<BaseMarketing>(MarketingApi.basePath, 'id', 'so_number', '', {
+    limit: 'limit',
   });
 
+  const productsOptions = useMemo(() => {
+    if (!productsRawData || !isResponseSuccess(productsRawData)) return [];
+
+    const productsMap = new Map<number, { value: number; label: string }>();
+
+    productsRawData.data.forEach((deliveryOrder: BaseMarketing) => {
+      deliveryOrder.sales_order?.forEach((so: BaseSalesOrder) => {
+        const product = so.product_warehouse?.product;
+        if (product?.id && product?.name) {
+          productsMap.set(product.id, {
+            value: product.id,
+            label: product.name,
+          });
+        }
+      });
+    });
+
+    return Array.from(productsMap.values());
+  }, [productsRawData]);
+
   const {
     options: customersOptions,
     isLoadingOptions: isLoadingCustomersOptions,
     setInputValue: setCustomersInputValue,
     loadMore: loadMoreCustomers,
-  } = useSelect(CustomerApi.basePath, 'id', 'name', 'search', {
-    has_marketing: 'true',
+  } = useSelect(MarketingApi.basePath, 'customer.id', 'customer.name', '', {
+    limit: 'limit',
   });
 
-  const {
-    options: projectFlockOptions,
-    rawData: projectFlocksRawData,
-    isLoadingOptions: isLoadingProjectFlockOptions,
-    setInputValue: setProjectFlockInputValue,
-    loadMore: loadMoreProjectFlocks,
-  } = useSelect<ProjectFlock>(
-    ProjectFlockApi.basePath,
-    'id',
-    'flock_name',
-    'search'
-  );
+  const uniqueCustomersOptions = useMemo(() => {
+    const seen = new Set();
+    return customersOptions.filter((customer) => {
+      if (seen.has(customer.value)) return false;
+      seen.add(customer.value);
+      return true;
+    });
+  }, [customersOptions]);
 
   const statusOptions = [
     ...MARKETING_APPROVAL_LINE.map((item) => ({
@@ -87,30 +87,23 @@ const MarketingFilterModal = ({
     { value: 'DITOLAK', label: 'Ditolak' },
   ];
 
-  const formik = useFormik<MarketingFilterFormValues>({
-    initialValues: initialValues || {
+  const formik = useFormik<{
+    product_ids: OptionType[];
+    status: OptionType | null;
+    customer_id: OptionType | null;
+  }>({
+    initialValues: {
       product_ids: [],
       status: null,
-      customer: null,
-      project_flock: null,
-      project_flock_kandang: null,
+      customer_id: null,
     },
-    validationSchema: MarketingFilterSchema,
 
     onSubmit: async (values) => {
-      const formattedValues: MarketingFilter = {
+      const formattedValues = {
+        ...values,
         product_ids: values.product_ids.map((item) => Number(item.value)),
-        product_names: values.product_ids.map((item) => item.label),
         status: values.status?.value.toString() || '',
-        status_name: values.status?.label || '-',
-        customer_id: Number(values.customer?.value),
-        customer_name: values.customer?.label || '-',
-        project_flock_id: values.project_flock?.value || undefined,
-        project_flock_name: values.project_flock?.label,
-        project_flock_kandang_id:
-          Number(values.project_flock_kandang?.value) || undefined,
-        project_flock_kandang_name:
-          values.project_flock_kandang?.label || undefined,
+        customer_id: Number(values.customer_id?.value),
       };
 
       onSubmit?.(formattedValues);
@@ -123,58 +116,18 @@ const MarketingFilterModal = ({
     },
   });
 
-  const { resetForm } = formik;
-
-  const formikResetHandler = useCallback(() => {
-    resetForm({
-      values: {
-        product_ids: [],
-        status: null,
-        customer: null,
-        project_flock: null,
-        project_flock_kandang: null,
-      },
-    });
-    onReset?.();
-    closeModalHandler();
-  }, [resetForm, onReset, closeModalHandler]);
-
   const productChangeHandler = (val: OptionType | OptionType[] | null) => {
     formik.setFieldValue('product_ids', val as OptionType[]);
   };
 
   const customerChangeHandler = (val: OptionType | OptionType[] | null) => {
-    formik.setFieldValue(
-      'customer',
-      !Array.isArray(val) ? (val as OptionType<number> | null) : null
-    );
+    formik.setFieldValue('customer_id', val as OptionType);
   };
 
   const statusChangeHandler = (val: OptionType | OptionType[] | null) => {
     formik.setFieldValue('status', val as OptionType);
   };
 
-  const projectFlockKandangOptions = useMemo(() => {
-    if (
-      !formik.values.project_flock ||
-      !projectFlocksRawData ||
-      !isResponseSuccess(projectFlocksRawData)
-    ) {
-      return [];
-    }
-
-    const selectedProjectFlock = projectFlocksRawData.data.find(
-      (item) => item.id === formik.values.project_flock?.value
-    );
-
-    return (
-      selectedProjectFlock?.kandangs?.map((item) => ({
-        value: item.project_flock_kandang_id,
-        label: item.name,
-      })) || []
-    );
-  }, [formik.values.project_flock, projectFlocksRawData]);
-
   return (
     <Modal
       ref={ref}
@@ -184,7 +137,7 @@ const MarketingFilterModal = ({
     >
       <form
         onSubmit={formik.handleSubmit}
-        onReset={formikResetHandler}
+        onReset={formik.handleReset}
         className='w-full flex flex-col'
       >
         {/* Modal Header */}
@@ -234,44 +187,13 @@ const MarketingFilterModal = ({
             label='Customer'
             isClearable
             placeholder='Pilih customer'
-            options={customersOptions}
+            options={uniqueCustomersOptions}
             isLoading={isLoadingCustomersOptions}
-            value={formik.values.customer}
+            value={formik.values.customer_id}
             onChange={customerChangeHandler}
             onInputChange={setCustomersInputValue}
             onMenuScrollToBottom={loadMoreCustomers}
           />
-          <SelectInput
-            label='Project Flock'
-            isClearable
-            placeholder='Pilih Project Flock'
-            options={projectFlockOptions}
-            isLoading={isLoadingProjectFlockOptions}
-            value={formik.values.project_flock}
-            onChange={(val) => {
-              formik.setFieldValue(
-                'project_flock',
-                !Array.isArray(val) ? (val as OptionType<number> | null) : null
-              );
-              formik.setFieldValue('project_flock_kandang', null);
-            }}
-            onInputChange={setProjectFlockInputValue}
-            onMenuScrollToBottom={loadMoreProjectFlocks}
-          />
-          <SelectInput
-            label='Kandang'
-            isClearable
-            placeholder='Pilih Kandang'
-            options={projectFlockKandangOptions}
-            value={formik.values.project_flock_kandang}
-            onChange={(val) =>
-              formik.setFieldValue(
-                'project_flock_kandang',
-                !Array.isArray(val) ? (val as OptionType<number> | null) : null
-              )
-            }
-            isDisabled={!formik.values.project_flock}
-          />
         </div>
 
         {/* Modal Footer */}

src/components/pages/marketing/MarketingTable.tsx

@@ -2,39 +2,26 @@
 
 import Button from '@/components/Button';
 import CheckboxInput from '@/components/input/CheckboxInput';
-import DateInput from '@/components/input/DateInput';
-import TextArea from '@/components/input/TextArea';
 import Modal, { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
 import Table from '@/components/Table';
-import {
-  getErrorMessage,
-  isResponseError,
-  isResponseSuccess,
-} from '@/lib/api-helper';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { cn, formatCurrency, formatDate, formatTitleCase } from '@/lib/helper';
 import {
   MarketingApi,
   SalesOrderApi,
 } from '@/services/api/marketing/marketing';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { BaseApiResponse } from '@/types/api/api-general';
 import {
   BaseSalesOrder,
   Marketing,
   MarketingFilter,
 } from '@/types/api/marketing/marketing';
 import { Icon } from '@iconify/react';
-import {
-  CellContext,
-  ColumnDef,
-  Row,
-  SortingState,
-  Updater,
-} from '@tanstack/react-table';
+import { CellContext, ColumnDef, Row } from '@tanstack/react-table';
 import { useRouter } from 'next/navigation';
-import { ChangeEventHandler, useCallback, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 import toast from 'react-hot-toast';
 import useSWR from 'swr';
 import RequirePermission from '@/components/helper/RequirePermission';
@@ -167,21 +154,12 @@ const MarketingTable = () => {
   );
   const [selectedItem, setSelectedItem] = useState<Marketing | null>(null);
   const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
-  const [bulkDeliveryDate, setBulkDeliveryDate] = useState('');
-  const [bulkDeliveryNotes, setBulkDeliveryNotes] = useState('');
-  const [isSubmittingBulkDelivery, setIsSubmittingBulkDelivery] =
-    useState(false);
-  const [isExportProgressLoading, setIsExportProgressLoading] = useState(false);
-  const [exportProgressStartDate, setExportProgressStartDate] = useState('');
-  const [exportProgressEndDate, setExportProgressEndDate] = useState('');
 
   const router = useRouter();
   const deleteModal = useModal();
   const confirmationModal = useModal();
   const productsModal = useModal();
   const deliveryModal = useModal();
-  const bulkDeliveryModal = useModal();
-  const exportProgressInputModal = useModal();
   const filterModal = useModal();
 
   const {
@@ -194,17 +172,8 @@ const MarketingTable = () => {
     initial: {
       search: '',
       product_ids: '',
-      product_names: '',
       status: '',
-      status_name: '',
       customer_id: '',
-      customer_name: '',
-      project_flock_id: '',
-      project_flock_name: '',
-      project_flock_kandang_id: '',
-      project_flock_kandang_name: '',
-      sort_by: '',
-      order_by: '',
     },
     paramMap: {
       page: 'page',
@@ -212,43 +181,9 @@ const MarketingTable = () => {
       product_ids: 'product_ids',
       status: 'status',
       customer_id: 'customer_id',
-      project_flock_id: 'project_flock_id',
-      project_flock_kandang_id: 'project_flock_kandang_id',
-      sort_by: 'sort_by',
-      order_by: 'sort_order',
     },
-    excludeKeysFromUrl: [
-      'product_names',
-      'status_name',
-      'customer_name',
-      'project_flock_name',
-      'project_flock_kandang_name',
-    ],
-
-    persist: true,
-    storeName: 'marketing-table',
   });
 
-  const sorting: SortingState = tableFilterState.sort_by
-    ? [
-        {
-          id: tableFilterState.sort_by,
-          desc: tableFilterState.order_by === 'desc',
-        },
-      ]
-    : [];
-
-  const handleSortingChange = (updater: Updater<SortingState>) => {
-    const next = typeof updater === 'function' ? updater(sorting) : updater;
-    if (next.length > 0) {
-      updateFilter('sort_by', next[0].id, true);
-      updateFilter('order_by', next[0].desc ? 'desc' : 'asc', true);
-    } else {
-      updateFilter('sort_by', '', true);
-      updateFilter('order_by', '', true);
-    }
-  };
-
   // ===== FETCH DATA =====
   const {
     data: marketing,
@@ -263,64 +198,26 @@ const MarketingTable = () => {
   const filterSubmitHandler = (values: MarketingFilter) => {
     updateFilter(
       'product_ids',
-      values.product_ids?.map((item) => item.toString()).join(','),
-      true
+      values.product_ids?.map((item) => item.toString()).join(',')
     );
-    updateFilter('product_names', values.product_names?.join(','));
-    updateFilter('status', values.status ? values.status.toString() : '', true);
-    updateFilter('status_name', values.status_name, true);
+    updateFilter('status', values.status ? values.status.toString() : '');
     updateFilter(
       'customer_id',
-      values.customer_id ? values.customer_id.toString() : '',
-      true
-    );
-    updateFilter('customer_name', values.customer_name, true);
-    updateFilter(
-      'project_flock_id',
-      values.project_flock_id ? values.project_flock_id.toString() : '',
-      true
-    );
-    updateFilter('project_flock_name', values.project_flock_name ?? '', true);
-    updateFilter(
-      'project_flock_kandang_id',
-      values.project_flock_kandang_id
-        ? values.project_flock_kandang_id.toString()
-        : '',
-      true
-    );
-    updateFilter(
-      'project_flock_kandang_name',
-      values.project_flock_kandang_name ?? '',
-      true
+      values.customer_id ? values.customer_id.toString() : ''
     );
   };
 
   const [isLoadingExportingToExcel, setIsLoadingExportingToExcel] =
     useState(false);
-  const [isApproveLoading, setIsApproveLoading] = useState(false);
-  const [isDeliveryLoading, setIsDeliveryLoading] = useState(false);
 
   const filterResetHandler = () => {
-    updateFilter('product_ids', '', true);
-    updateFilter('product_names', '', true);
-    updateFilter('status', '', true);
-    updateFilter('status_name', '', true);
-    updateFilter('customer_id', '', true);
-    updateFilter('customer_name', '', true);
-    updateFilter('project_flock_id', '', true);
-    updateFilter('project_flock_name', '', true);
-    updateFilter('project_flock_kandang_id', '', true);
-    updateFilter('project_flock_kandang_name', '', true);
+    updateFilter('product_ids', '');
+    updateFilter('status', '');
+    updateFilter('customer_id', '');
   };
 
   const approveClickHandler = () => {
     setApproveAction('APPROVED');
-
-    if (selectedApprovalStep === 2) {
-      bulkDeliveryModal.openModal();
-      return;
-    }
-
     confirmationModal.openModal();
   };
 
@@ -329,14 +226,6 @@ const MarketingTable = () => {
     confirmationModal.openModal();
   };
 
-  const productsClickHandler = useCallback(
-    (item: Marketing) => {
-      setSelectedItem(item);
-      productsModal.openModal();
-    },
-    [productsModal]
-  );
-
   const deleteMarketingHandler = async () => {
     const deleteMarketingRes = await MarketingApi.delete(
       selectedItem?.id as number
@@ -357,226 +246,75 @@ const MarketingTable = () => {
   const selectedRowsData = allData.filter(
     (row) => rowSelection[row.id.toString()]
   );
-  const selectedApprovalStep =
-    selectedRowsData.length > 0
-      ? selectedRowsData[0].latest_approval.step_number
-      : null;
 
-  const eligibleSelectedRows = selectedRowsData.filter((row) => {
-    const approval = row.latest_approval;
-
-    if (approval.action === 'REJECTED') {
-      return false;
-    }
-
-    if (selectedApprovalStep === null) {
-      return approval.step_number === 1 || approval.step_number === 2;
-    }
-
-    return approval.step_number === selectedApprovalStep;
-  });
-
-  const hasApprovable = eligibleSelectedRows.length > 0;
-  const hasRejectable = eligibleSelectedRows.length > 0;
+  const hasApprovable = selectedRowsData.some(
+    (row) =>
+      row.latest_approval.step_number === 1 &&
+      row.latest_approval.action !== 'REJECTED'
+  );
+  const hasRejectable = selectedRowsData.some(
+    (row) =>
+      row.latest_approval.step_number === 1 &&
+      row.latest_approval.action !== 'REJECTED'
+  );
 
   const disableApprove = !hasApprovable;
   const disableReject = !hasRejectable;
 
-  const idsToProcess = eligibleSelectedRows.map((row) => row.id);
-  const nextApprovalStatus =
-    selectedApprovalStep === 1
-      ? 'SALES_ORDER'
-      : selectedApprovalStep === 2
-        ? 'DELIVERY_ORDER'
-        : null;
-
-  const productIds = tableFilterState.product_ids
-    ? tableFilterState.product_ids
-        .split(',')
-        .map((item) => item.trim())
-        .filter(Boolean)
-    : [];
-
-  const productLabels = tableFilterState.product_names
-    ? tableFilterState.product_names
-        .split(',')
-        .map((item) => item.trim())
-        .filter(Boolean)
-    : [];
-
-  const marketingFilterInitialValues = {
-    product_ids: productIds.map((value, idx) => ({
-      value: Number(value),
-      label: productLabels[idx] || '-',
-    })),
-    status: tableFilterState.status
-      ? {
-          value: tableFilterState.status,
-          label: tableFilterState.status_name,
-        }
-      : null,
-    customer: tableFilterState.customer_id
-      ? {
-          value: Number(tableFilterState.customer_id),
-          label: tableFilterState.customer_name,
-        }
-      : null,
-    project_flock: tableFilterState.project_flock_id
-      ? {
-          value: Number(tableFilterState.project_flock_id),
-          label: tableFilterState.project_flock_name,
-        }
-      : null,
-    project_flock_kandang: tableFilterState.project_flock_kandang_id
-      ? {
-          value: Number(tableFilterState.project_flock_kandang_id),
-          label: tableFilterState.project_flock_kandang_name,
-        }
-      : null,
-  };
+  const idsToProcess =
+    approveAction === 'APPROVED'
+      ? selectedRowsData
+          .filter((row) => row.latest_approval.step_number === 1)
+          .map((row) => row.id)
+      : selectedRowsData
+          .filter((row) => row.latest_approval.step_number === 2)
+          .map((row) => row.id);
 
   const approveMarketingHandler = async (notes: string) => {
+    let idsToProcess: number[] = [];
+
+    idsToProcess = selectedRowsData
+      .filter((row) => row.latest_approval.step_number === 1)
+      .map((row) => row.id);
+
     if (idsToProcess.length === 0) {
       toast.error(`Tidak ada data yang valid untuk di ${approveAction}.`);
       confirmationModal.closeModal();
       return;
     }
 
-    if (approveAction === 'APPROVED' && selectedApprovalStep !== 1) {
-      toast.error('Approve tahap ini harus menggunakan tanggal pengiriman.');
+    const approveMarketingRes = await SalesOrderApi.bulkApprovals(
+      idsToProcess,
+      approveAction,
+      notes
+    );
+
+    if (isResponseSuccess(approveMarketingRes)) {
       confirmationModal.closeModal();
-      return;
-    }
-
-    if (approveAction === 'APPROVED' && !nextApprovalStatus) {
-      toast.error('Status approval berikutnya tidak valid.');
-      confirmationModal.closeModal();
-      return;
-    }
-
-    setIsApproveLoading(true);
-
-    try {
-      const approveMarketingRes: BaseApiResponse<unknown> | undefined =
-        approveAction === 'APPROVED'
-          ? await MarketingApi.bulkApprovals(
-              idsToProcess,
-              nextApprovalStatus as 'SALES_ORDER' | 'DELIVERY_ORDER',
-              '',
-              notes || `APPROVED marketing ${idsToProcess.join(', ')}`
-            )
-          : await SalesOrderApi.bulkApprovals(
-              idsToProcess,
-              approveAction,
-              notes
-            );
-
-      if (isResponseSuccess(approveMarketingRes)) {
-        confirmationModal.closeModal();
-        toast.success(approveMarketingRes?.message as string);
-        setRowSelection({});
-      }
-
-      refreshMarketing();
-    } finally {
-      setIsApproveLoading(false);
-    }
-  };
-
-  const bulkDeliveryDateChangeHandler: ChangeEventHandler<HTMLInputElement> = (
-    e
-  ) => {
-    setBulkDeliveryDate(e.target.value);
-  };
-
-  const bulkDeliveryNotesChangeHandler: ChangeEventHandler<
-    HTMLTextAreaElement
-  > = (e) => {
-    setBulkDeliveryNotes(e.target.value);
-  };
-
-  const submitBulkDeliveryApprovalHandler = async (
-    selectedIds: number[],
-    deliveryDate: string,
-    notes: string
-  ) => {
-    if (selectedIds.length === 0) {
-      toast.error('Tidak ada data yang valid untuk diproses.');
-      return;
-    }
-
-    if (!deliveryDate) {
-      toast.error('Tanggal pengiriman wajib diisi.');
-      return;
-    }
-
-    setIsSubmittingBulkDelivery(true);
-
-    try {
-      const bulkDeliveryApprovalRes = await MarketingApi.bulkApprovals(
-        selectedIds,
-        'DELIVERY_ORDER',
-        deliveryDate,
-        notes || `APPROVED delivery marketing ${selectedIds.join(', ')}`
-      );
-
-      if (isResponseError(bulkDeliveryApprovalRes)) {
-        toast.error(bulkDeliveryApprovalRes?.message as string);
-        return;
-      }
-
-      if (!isResponseSuccess(bulkDeliveryApprovalRes)) {
-        toast.error('Gagal memproses bulk approve delivery.');
-        return;
-      }
-
-      toast.success(bulkDeliveryApprovalRes?.message as string);
-      bulkDeliveryModal.closeModal();
-      setBulkDeliveryDate('');
-      setBulkDeliveryNotes('');
+      toast.success(approveMarketingRes?.message as string);
       setRowSelection({});
-      refreshMarketing();
-    } finally {
-      setIsSubmittingBulkDelivery(false);
     }
+    if (isResponseError(approveMarketingRes)) {
+      confirmationModal.closeModal();
+      toast.error(approveMarketingRes?.message as string);
+    }
+    refreshMarketing();
   };
 
   const confirmationModalDeliveryClickHandler = async (notes: string) => {
-    setIsDeliveryLoading(true);
-    try {
-      const res = await SalesOrderApi.delivery(
-        selectedItem?.id as number,
-        notes
-      );
-      deliveryModal.closeModal();
-      toast.success(res?.message as string);
-      refreshMarketing?.();
-      router.push(
-        `/marketing/detail/delivery-orders/edit?id=${selectedItem?.id}`
-      );
-    } finally {
-      setIsDeliveryLoading(false);
-    }
+    const res = await SalesOrderApi.delivery(selectedItem?.id as number, notes);
+    deliveryModal.closeModal();
+    toast.success(res?.message as string);
+    refreshMarketing?.();
+    router.push(
+      `/marketing/detail/delivery-orders/edit?id=${selectedItem?.id}`
+    );
   };
 
-  const getRowCanSelect = useCallback(
-    (row: Row<Marketing>): boolean => {
-      const approval = row.original.latest_approval;
-      const isSelectableStep =
-        approval?.step_number === 1 || approval?.step_number === 2;
-
-      if (!isSelectableStep || approval?.action === 'REJECTED') {
-        return false;
-      }
-
-      if (selectedApprovalStep === null) {
-        return true;
-      }
-
-      return approval?.step_number === selectedApprovalStep;
-    },
-    [selectedApprovalStep]
-  );
+  const getRowCanSelect = (row: Row<Marketing>): boolean => {
+    const approval = row.original.latest_approval;
+    return approval?.step_number === 1 && approval?.action !== 'REJECTED';
+  };
 
   const exportToExcelHandler = async () => {
     setIsLoadingExportingToExcel(true);
@@ -586,53 +324,6 @@ const MarketingTable = () => {
     setIsLoadingExportingToExcel(false);
   };
 
-  const resetExportProgressForm = () => {
-    setExportProgressStartDate('');
-    setExportProgressEndDate('');
-  };
-
-  const exportProgressStartDateChangeHandler: ChangeEventHandler<
-    HTMLInputElement
-  > = (e) => {
-    setExportProgressStartDate(e.target.value);
-  };
-
-  const exportProgressEndDateChangeHandler: ChangeEventHandler<
-    HTMLInputElement
-  > = (e) => {
-    setExportProgressEndDate(e.target.value);
-  };
-
-  const exportProgressInputToExcelClickHandler = () => {
-    resetExportProgressForm();
-    exportProgressInputModal.openModal();
-  };
-
-  const submitExportProgressInputHandler = async () => {
-    if (!exportProgressStartDate || !exportProgressEndDate) {
-      return;
-    }
-
-    setIsExportProgressLoading(true);
-
-    try {
-      await MarketingApi.exportInputProgressToExcel(
-        exportProgressStartDate,
-        exportProgressEndDate
-      );
-
-      exportProgressInputModal.closeModal();
-      resetExportProgressForm();
-      toast.success('Ekspor berhasil');
-    } catch (error) {
-      toast.error(
-        await getErrorMessage(error, 'Gagal mengekspor input progress')
-      );
-    } finally {
-      setIsExportProgressLoading(false);
-    }
-  };
-
   const columns = useMemo<ColumnDef<Marketing>[]>(() => {
     return [
       {
@@ -640,22 +331,7 @@ const MarketingTable = () => {
         size: 1,
         header: ({ table }) => {
           const allRows = table.getRowModel().rows;
-          const stepForBulkSelection =
-            selectedApprovalStep ??
-            allRows.find(getRowCanSelect)?.original.latest_approval.step_number;
-          const selectableRows = allRows.filter((row) => {
-            if (!getRowCanSelect(row)) {
-              return false;
-            }
-
-            if (!stepForBulkSelection) {
-              return false;
-            }
-
-            return (
-              row.original.latest_approval.step_number === stepForBulkSelection
-            );
-          });
+          const selectableRows = allRows.filter(getRowCanSelect);
 
           const allSelected =
             selectableRows.length > 0 &&
@@ -697,7 +373,7 @@ const MarketingTable = () => {
         },
       },
       {
-        accessorKey: 'so_number',
+        accessorKey: 'so_do_number',
         header: 'No. Order',
         cell: (props) => {
           return props.row.original.do_number
@@ -713,7 +389,7 @@ const MarketingTable = () => {
         },
       },
       {
-        accessorKey: 'status',
+        accessorKey: 'approval.step_name',
         header: 'Status',
         cell: (props) => {
           const approval = props.row.original.latest_approval;
@@ -748,12 +424,10 @@ const MarketingTable = () => {
         },
       },
       {
-        accessorKey: 'customer',
+        accessorKey: 'customer.name',
         header: 'Customer',
-        cell: (props) => props.row.original.customer.name,
       },
       {
-        accessorKey: 'grand_total',
         accessorFn: (row) =>
           row.sales_order
             ?.map((product) => product.total_price)
@@ -770,8 +444,12 @@ const MarketingTable = () => {
       {
         accessorKey: 'marketing_products.length',
         header: 'Product Details',
-        enableSorting: false,
         cell: (props) => {
+          const productsClickHandler = (item: Marketing) => {
+            setSelectedItem(item);
+            productsModal.openModal();
+          };
+
           if (props?.row?.original?.sales_order?.length) {
             if (props?.row?.original?.sales_order?.length > 1) {
               return (
@@ -792,14 +470,6 @@ const MarketingTable = () => {
           }
         },
       },
-      {
-        accessorKey: 'created_at',
-        header: 'Tanggal Dibuat',
-        cell: (props) =>
-          props.row.original.created_at
-            ? formatDate(props.row.original.created_at, 'DD MMM yyyy')
-            : '-',
-      },
       {
         id: 'actions',
         maxSize: 80,
@@ -834,13 +504,7 @@ const MarketingTable = () => {
         },
       },
     ];
-  }, [
-    deleteModal,
-    deliveryModal,
-    getRowCanSelect,
-    productsClickHandler,
-    selectedApprovalStep,
-  ]);
+  }, [deleteModal, deliveryModal, setSelectedItem, productsModal]);
 
   return (
     <>
@@ -863,7 +527,7 @@ const MarketingTable = () => {
             </RequirePermission>
             {idsToProcess.length > 0 && (
               <>
-                <div className='divider divider-horizontal w-px p-0 m-0 bg-base-content/10 text-base-content/10 before:bg-base-content/10 before:w-px after:bg-base-content/10 after:w-px' />
+                <div className='divider divider-horizontal w-px p-0 m-0 bg-base-content/10 text-base-content/10 before:bg-base-content/10 before:w-px after:bg-base-content/10 after:w-px'></div>
                 <RequirePermission permissions='lti.marketing.sales_order.approve'>
                   <Button
                     color='error'
@@ -877,7 +541,7 @@ const MarketingTable = () => {
                       width={20}
                       height={20}
                     />
-                    Reject ({idsToProcess.length} Item)
+                    Reject
                   </Button>
                 </RequirePermission>
                 <RequirePermission permissions='lti.marketing.sales_order.approve'>
@@ -893,7 +557,7 @@ const MarketingTable = () => {
                       width={20}
                       height={20}
                     />
-                    Approve ({idsToProcess.length} Item)
+                    Approve
                   </Button>
                 </RequirePermission>
               </>
@@ -902,18 +566,7 @@ const MarketingTable = () => {
           <div className='flex flex-row gap-3'>
             <ButtonFilter
               values={tableFilterState}
-              excludeFields={[
-                'page',
-                'pageSize',
-                'search',
-                'product_names',
-                'status_name',
-                'customer_name',
-                'project_flock_name',
-                'project_flock_kandang_name',
-                'sort_by',
-                'order_by',
-              ]}
+              excludeFields={['page', 'pageSize', 'search']}
               onClick={() => {
                 filterModal.openModal();
               }}
@@ -959,17 +612,7 @@ const MarketingTable = () => {
                 className='w-full p-3 justify-start text-sm text-base-content/50 font-semibold text-nowrap'
               >
                 <Icon icon='heroicons:table-cells' width={20} height={20} />
-                Ekspor ke Excel
-              </Button>
-
-              <Button
-                variant='ghost'
-                color='none'
-                onClick={exportProgressInputToExcelClickHandler}
-                className='w-full p-3 justify-start text-sm text-base-content/50 font-semibold text-nowrap'
-              >
-                <Icon icon='heroicons:table-cells' width={20} height={20} />
-                Ekspor Input Progress (Excel)
+                Export to Excel
               </Button>
             </Dropdown>
           </div>
@@ -1003,9 +646,6 @@ const MarketingTable = () => {
               columns={columns}
               pageSize={tableFilterState.pageSize}
               page={isResponseSuccess(marketing) ? marketing?.meta?.page : 1}
-              sorting={sorting}
-              setSorting={handleSortingChange}
-              manualSorting
               totalItems={
                 isResponseSuccess(marketing)
                   ? marketing?.meta?.total_results
@@ -1037,16 +677,14 @@ const MarketingTable = () => {
       <ConfirmationModalWithNotes
         ref={confirmationModal.ref}
         type={approveAction === 'APPROVED' ? 'success' : 'error'}
-        text={`Apakah anda yakin ingin ${approveAction == 'APPROVED' ? 'approve' : 'reject'} data penjualan tahap ${selectedApprovalStep ?? '-'} (${idsToProcess.length} data)?`}
+        text={`Apakah anda yakin ingin ${approveAction == 'APPROVED' ? 'approve' : 'reject'} data penjualan (${idsToProcess.length} data)?`}
         secondaryButton={{
           text: 'Tidak',
-          isLoading: isApproveLoading,
           onClick: confirmationModal.closeModal,
         }}
         primaryButton={{
           text: 'Ya',
           color: approveAction === 'APPROVED' ? 'success' : 'error',
-          isLoading: isApproveLoading,
           onClick: approveMarketingHandler,
         }}
       />
@@ -1070,169 +708,14 @@ const MarketingTable = () => {
         text={`Apakah anda yakin ingin deliver penjualan ${selectedItem?.so_number}?`}
         secondaryButton={{
           text: 'Tidak',
-          isLoading: isDeliveryLoading,
         }}
         primaryButton={{
           text: 'Ya',
           color: 'success',
-          isLoading: isDeliveryLoading,
           onClick: confirmationModalDeliveryClickHandler,
         }}
       />
 
-      <Modal
-        ref={bulkDeliveryModal.ref}
-        className={{
-          modalBox: 'max-w-lg rounded-lg p-0',
-        }}
-        closeOnBackdrop
-      >
-        <div className='flex flex-col'>
-          <div className='flex items-center justify-between border-b border-base-content/10 p-4'>
-            <h4 className='text-sm font-semibold text-base-content'>
-              Bulk Approve Delivery
-            </h4>
-            <Button
-              variant='ghost'
-              color='none'
-              onClick={() => {
-                bulkDeliveryModal.closeModal();
-                setBulkDeliveryDate('');
-                setBulkDeliveryNotes('');
-              }}
-              className='p-1'
-            >
-              <Icon icon='mdi:close' width={20} height={20} />
-            </Button>
-          </div>
-
-          <div className='flex flex-col gap-4 p-4'>
-            <p className='text-sm text-base-content/70'>
-              Pilih tanggal pengiriman untuk approve {idsToProcess.length} data
-              penjualan tahap 2.
-            </p>
-
-            <DateInput
-              name='bulk_delivery_date'
-              label='Tanggal Pengiriman'
-              value={bulkDeliveryDate}
-              onChange={bulkDeliveryDateChangeHandler}
-              isNestedModal
-              required
-            />
-
-            <TextArea
-              name='bulk_delivery_notes'
-              label='Catatan'
-              placeholder='Masukkan catatan approval...'
-              value={bulkDeliveryNotes}
-              onChange={bulkDeliveryNotesChangeHandler}
-              rows={4}
-            />
-          </div>
-
-          <div className='flex justify-end gap-3 border-t border-base-content/10 p-4'>
-            <Button
-              variant='outline'
-              color='none'
-              disabled={isSubmittingBulkDelivery}
-              onClick={() => {
-                bulkDeliveryModal.closeModal();
-                setBulkDeliveryDate('');
-                setBulkDeliveryNotes('');
-              }}
-              className='px-3 py-2.5'
-            >
-              Batal
-            </Button>
-            <Button
-              color='success'
-              isLoading={isSubmittingBulkDelivery}
-              disabled={isSubmittingBulkDelivery}
-              onClick={() =>
-                submitBulkDeliveryApprovalHandler(
-                  idsToProcess,
-                  bulkDeliveryDate,
-                  bulkDeliveryNotes
-                )
-              }
-              className='px-3 py-2.5'
-            >
-              Submit
-            </Button>
-          </div>
-        </div>
-      </Modal>
-      <Modal
-        ref={exportProgressInputModal.ref}
-        className={{
-          modalBox: 'max-w-lg rounded-lg p-0',
-        }}
-        closeOnBackdrop
-      >
-        <div className='flex flex-col'>
-          <div className='flex items-center justify-between border-b border-base-content/10 p-4'>
-            <h4 className='text-sm font-semibold text-base-content'>
-              Ekspor Input Progress
-            </h4>
-            <Button
-              variant='ghost'
-              color='none'
-              onClick={() => {
-                exportProgressInputModal.closeModal();
-                resetExportProgressForm();
-              }}
-              className='p-1'
-            >
-              <Icon icon='mdi:close' width={20} height={20} />
-            </Button>
-          </div>
-
-          <div className='flex flex-col gap-4 p-4'>
-            <DateInput
-              name='export_progress_start_date'
-              label='Tanggal Mulai'
-              value={exportProgressStartDate}
-              onChange={exportProgressStartDateChangeHandler}
-              isNestedModal
-              required
-            />
-
-            <DateInput
-              name='export_progress_end_date'
-              label='Tanggal Selesai'
-              value={exportProgressEndDate}
-              onChange={exportProgressEndDateChangeHandler}
-              isNestedModal
-              required
-            />
-          </div>
-
-          <div className='flex justify-end gap-3 border-t border-base-content/10 p-4'>
-            <Button
-              variant='outline'
-              color='none'
-              onClick={() => {
-                exportProgressInputModal.closeModal();
-                resetExportProgressForm();
-              }}
-              className='px-3 py-2.5'
-            >
-              Batal
-            </Button>
-            <Button
-              color='success'
-              onClick={submitExportProgressInputHandler}
-              isLoading={isExportProgressLoading}
-              disabled={!exportProgressStartDate || !exportProgressEndDate}
-              className='px-3 py-2.5'
-            >
-              Submit
-            </Button>
-          </div>
-        </div>
-      </Modal>
-
       <Modal
         ref={productsModal.ref}
         className={{
@@ -1263,7 +746,7 @@ const MarketingTable = () => {
           }
           columns={[
             {
-              header: 'Gudang Fisik',
+              header: 'Kandang',
               accessorFn(row) {
                 return row.product_warehouse.warehouse.name;
               },
@@ -1294,7 +777,6 @@ const MarketingTable = () => {
         ref={filterModal.ref}
         onSubmit={filterSubmitHandler}
         onReset={filterResetHandler}
-        initialValues={marketingFilterInitialValues}
       />
     </>
   );

src/components/pages/marketing/SalesOrderFormModal.tsx

@@ -195,9 +195,7 @@ const SalesOrderFormModal = ({
                   product.marketing_type?.value?.toLowerCase() === 'telur'
                     ? convertionUnitValue === 'PETI'
                       ? 'PETI'
-                      : convertionUnitValue === 'QTY'
-                        ? 'QTY'
-                        : 'KG'
+                      : 'KG' // termasuk "QTY" dan "KG"
                     : undefined;
 
                 // Jika value dari data product ada week, kirim "AYAM_PULLET, jika tidak ada kirim "AYAM"
@@ -209,6 +207,7 @@ const SalesOrderFormModal = ({
 
                 return {
                   vehicle_number: product.vehicle_number as string,
+                  kandang_id: product.kandang_id as number,
                   product_warehouse_id: product.product_warehouse_id as number,
                   unit_price: parseFloat(String(product.unit_price || 0)),
                   total_weight: parseFloat(String(product.total_weight || 0)),
@@ -246,7 +245,6 @@ const SalesOrderFormModal = ({
                 })
                 .filter((item) => Boolean(item)),
             } as UpdateDeliveryOrderPayload);
-
       switch (modalAction) {
         case 'add':
           await createMarketingHandler(payload as CreateSalesOrderPayload);
@@ -262,7 +260,11 @@ const SalesOrderFormModal = ({
 
   // ===== Formik Error List =====
   const { formErrorList, setFormErrorList, close, handleFormSubmit } =
-    useFormikErrorList(formik);
+    useFormikErrorList(formik, {
+      onAfterSubmit: () => {
+        router.push('/marketing');
+      },
+    });
 
   // ================== FORM REPEATER HANDLER ==================
   const createMarketingHandler = async (values: CreateSalesOrderPayload) => {
@@ -456,9 +458,13 @@ const SalesOrderFormModal = ({
     );
   }, [memoSalesOrder]);
 
+  const hasLoadedInitialValues = useRef(false);
   useEffect(() => {
     const getFilledInitialValues = async () => {
       if (marketingId && isResponseSuccess(marketing)) {
+        if (hasLoadedInitialValues.current) return;
+        hasLoadedInitialValues.current = true;
+
         const filledInitialValues = await getFilledMarketingFormInitialValues(
           marketing.data
         );

src/components/pages/marketing/filter/MarketingFilter.ts

@@ -1,18 +0,0 @@
-import { array, mixed, object } from 'yup';
-import { OptionType } from '@/components/input/SelectInput';
-
-export const MarketingFilterSchema = object({
-  product_ids: array().of(mixed<OptionType<number>>().required()).required(),
-  status: mixed<OptionType<string>>().nullable(),
-  customer: mixed<OptionType<number>>().nullable(),
-  project_flock: mixed<OptionType<number>>().nullable(),
-  project_flock_kandang: mixed<OptionType<number>>().nullable(),
-});
-
-export type MarketingFilterFormValues = {
-  product_ids: OptionType<number>[];
-  status: OptionType<string> | null;
-  customer: OptionType<number> | null;
-  project_flock: OptionType<number> | null;
-  project_flock_kandang: OptionType<number> | null;
-};

src/components/pages/marketing/form/MarketingForm.schema.ts

@@ -13,7 +13,6 @@ import {
   Marketing,
 } from '@/types/api/marketing/marketing';
 import { formatDate, formatTitleCase } from '@/lib/helper';
-import { getProductWarehouseOptionLabel } from '@/lib/product-warehouse';
 
 type MarketingSchemaType = {
   customer_id: number | undefined;
@@ -71,14 +70,14 @@ export const DeliveryOrderSchema: Yup.ObjectSchema<DeliveryOrderSchemaType> =
       .required('Pengiriman wajib diisi!')
       .test(
         'at-least-one-valid-row',
-        'Seluruh data pengiriman harus diisi lengkap!',
+        'Minimal harus  ada satu baris pengiriman yang lengkap diisi!',
         function (items) {
           if (!items || items.length === 0) return false;
 
-          // VALIDASI: seluruh item harus valid full
+          // VALIDASI: minimal 1 item valid full
           const itemSchema = DeliveryOrderProductSchema;
 
-          const hasValidItem = items.every((item) => {
+          const hasValidItem = items.some((item) => {
             if (!item) return false;
             return itemSchema.isValidSync(item, { abortEarly: true });
           });
@@ -98,21 +97,17 @@ export type DeliveryOrderFormValues = Yup.InferType<typeof DeliveryOrderSchema>;
 export const SalesProductToFieldValues = (
   product: BaseSalesOrder
 ): SalesOrderProductFormValues => {
-  const warehouseOption = {
-    value: product.product_warehouse.warehouse.id,
-    label: product.product_warehouse.warehouse.name,
-  };
-
   return {
     id: product.id,
     vehicle_number: product.vehicle_number,
-    warehouse_id: product.product_warehouse.warehouse.id,
-    warehouse: warehouseOption,
     kandang_id: product.product_warehouse.warehouse.id,
-    kandang: warehouseOption,
+    kandang: {
+      value: product.product_warehouse.warehouse.id,
+      label: product.product_warehouse.warehouse.name,
+    },
     product_warehouse: {
       value: product.product_warehouse.id,
-      label: getProductWarehouseOptionLabel(product.product_warehouse),
+      label: product.product_warehouse.product.name,
     },
     product_warehouse_data: product.product_warehouse,
     product_warehouse_id: product.product_warehouse.id,
@@ -123,17 +118,8 @@ export const SalesProductToFieldValues = (
     total_price: product.total_price,
     marketing_type: product.marketing_type
       ? {
-          value:
-            product.marketing_type === 'AYAM' ||
-            product.marketing_type === 'AYAM_PULLET'
-              ? 'AYAM,AYAM_PULLET'
-              : product.marketing_type,
-          label: formatTitleCase(
-            product.marketing_type === 'AYAM' ||
-              product.marketing_type === 'AYAM_PULLET'
-              ? 'AYAM'
-              : product.marketing_type
-          ),
+          value: product.marketing_type,
+          label: formatTitleCase(product.marketing_type),
         }
       : null,
     convertion_unit: product.convertion_unit
@@ -153,36 +139,11 @@ export const DeliveryProductToFieldValues = (
   delivery: BaseDeliveryOrder
 ): DeliveryOrderProductFormValues[] => {
   const data = delivery.deliveries.map((item) => {
-    const salesOrder =
-      salesOrders.find((so) => so.id === item.marketing_product_id) ??
-      salesOrders.find(
-        (so) => so.product_warehouse.id === item.product_warehouse.id
-      );
-    const warehouseOption = {
-      value: item.product_warehouse.warehouse.id,
-      label: item.product_warehouse.warehouse.name,
-    };
-
-    const initialSisaBerat =
-      item?.total_weight &&
-      salesOrder?.weight_per_convertion &&
-      salesOrder?.total_peti
-        ? Number(item.total_weight) -
-          Number(salesOrder.weight_per_convertion) *
-            Number(salesOrder.total_peti)
-        : 0;
-
-    const initialPricePerConvertion =
-      item?.total_price &&
-      salesOrder?.total_peti &&
-      Number(salesOrder.total_peti) !== 0
-        ? (Number(item.total_price) -
-            initialSisaBerat * Number(item.unit_price || 0)) /
-          Number(salesOrder.total_peti)
-        : Number(item?.unit_price || 0);
-
+    const soId = salesOrders.find(
+      (so) => so.product_warehouse.id === item.product_warehouse.id
+    )?.id;
     return {
-      id: salesOrder?.id,
+      id: soId,
       unit_price: item.unit_price,
       total_weight: item.total_weight,
       qty: item.qty,
@@ -191,40 +152,19 @@ export const DeliveryProductToFieldValues = (
       vehicle_number: item.vehicle_number,
       delivery_date: formatDate(delivery.delivery_date, 'yyyy-MM-DD'),
       do_number: delivery.do_number,
-      marketing_product_id: item.marketing_product_id ?? salesOrder?.id,
-      marketing_type: salesOrder?.marketing_type
-        ? {
-            value:
-              salesOrder?.marketing_type === 'AYAM' ||
-              salesOrder?.marketing_type === 'AYAM_PULLET'
-                ? 'AYAM,AYAM_PULLET'
-                : salesOrder?.marketing_type,
-            label: formatTitleCase(
-              salesOrder?.marketing_type === 'AYAM' ||
-                salesOrder?.marketing_type === 'AYAM_PULLET'
-                ? 'AYAM'
-                : salesOrder?.marketing_type
-            ),
-          }
-        : null,
-      convertion_unit: salesOrder?.convertion_unit
-        ? {
-            value: salesOrder?.convertion_unit.toLowerCase(),
-            label: formatTitleCase(salesOrder?.convertion_unit),
-          }
-        : null,
+      marketing_product_id: soId,
       marketing_product: {
-        id: item.marketing_product_id ?? salesOrder?.id,
+        id: soId,
         vehicle_number: item.vehicle_number,
-        warehouse_id: item.product_warehouse.warehouse.id,
-        warehouse: warehouseOption,
         kandang_id: item.product_warehouse.warehouse.id,
-        kandang: warehouseOption,
+        kandang: {
+          value: item.product_warehouse.warehouse.id,
+          label: item.product_warehouse.warehouse.name,
+        },
         product_warehouse: {
           value: item.product_warehouse.id,
-          label: getProductWarehouseOptionLabel(item.product_warehouse),
+          label: item.product_warehouse.product.name,
         },
-        product_warehouse_data: item.product_warehouse,
         product_warehouse_id: item.product_warehouse.id,
         unit_price: item.unit_price,
         total_weight: item.total_weight,
@@ -232,13 +172,8 @@ export const DeliveryProductToFieldValues = (
         avg_weight: item.avg_weight,
         total_price: item.total_price,
       },
-      total_peti: salesOrder?.total_peti,
-      weight_per_convertion:
-        item?.weight_per_convertion ?? salesOrder?.weight_per_convertion ?? 0,
-      price_per_convertion: initialPricePerConvertion,
     } as DeliveryOrderProductFormValues;
   });
-
   return data;
 };
 export const mergeSOwithDO = (
@@ -246,25 +181,10 @@ export const mergeSOwithDO = (
   deliveryOrders: DeliveryOrderProductFormValues[],
   autofill?: boolean
 ): DeliveryOrderProductFormValues[] => {
-  const hasDeliveryOrders = deliveryOrders.length > 0;
-
   return salesOrders.map((so) => {
     const delivery = deliveryOrders.find(
       (d) => d?.marketing_product_id === so.id
     );
-    const isTelurQty =
-      so.marketing_type?.value?.toLowerCase() === 'telur' &&
-      so.convertion_unit?.value?.toLowerCase() === 'qty';
-    const salesOrderUnitPrice =
-      isTelurQty && Number(so.total_price || 0) > 0 && Number(so.qty || 0) > 0
-        ? Number(so.total_price) / Number(so.qty)
-        : so.unit_price;
-    const salesOrderPricePerQty =
-      isTelurQty &&
-      Number(so.total_price || 0) > 0 &&
-      Number(so.total_weight || 0) > 0
-        ? Number(so.total_price) / Number(so.total_weight)
-        : so.price_per_qty;
 
     return {
       ...so, // nilai dasar dari sales order
@@ -272,50 +192,30 @@ export const mergeSOwithDO = (
       delivery_date: delivery?.delivery_date || undefined,
       do_number: delivery?.do_number || undefined,
       vehicle_number: delivery?.vehicle_number || so.vehicle_number,
-      unit_price:
-        autofill && hasDeliveryOrders
-          ? delivery?.unit_price
-          : salesOrderUnitPrice,
-      total_weight:
-        autofill && hasDeliveryOrders
-          ? delivery?.total_weight
-          : so.total_weight,
-      qty: autofill && hasDeliveryOrders ? delivery?.qty : so.qty,
-      avg_weight:
-        autofill && hasDeliveryOrders ? delivery?.avg_weight : so.avg_weight,
-      total_price:
-        autofill && hasDeliveryOrders ? delivery?.total_price : so.total_price,
+      unit_price: autofill ? so.unit_price : delivery?.unit_price,
+      total_weight: autofill ? so.total_weight : delivery?.total_weight,
+      qty: autofill ? so.qty : delivery?.qty,
+      avg_weight: autofill ? so.avg_weight : delivery?.avg_weight,
+      total_price: autofill ? so.total_price : delivery?.total_price,
       marketing_product: so, // jika ada, override
-      uom: autofill && hasDeliveryOrders ? delivery?.uom : so.uom,
-      weight_per_convertion:
-        autofill && hasDeliveryOrders
-          ? delivery?.weight_per_convertion
-          : so.weight_per_convertion,
-      price_per_convertion:
-        autofill && hasDeliveryOrders
-          ? delivery?.price_per_convertion
-          : so.price_per_convertion,
-      convertion_unit:
-        autofill && hasDeliveryOrders
-          ? delivery?.convertion_unit
-          : so.convertion_unit,
-      marketing_type:
-        autofill && hasDeliveryOrders
-          ? delivery?.marketing_type
-          : so.marketing_type,
-      total_peti:
-        autofill && hasDeliveryOrders ? delivery?.total_peti : so.total_peti,
-      price_per_qty:
-        autofill && hasDeliveryOrders
-          ? delivery?.price_per_qty
-          : salesOrderPricePerQty,
-      sisa_berat:
-        autofill && hasDeliveryOrders ? delivery?.sisa_berat : so.sisa_berat,
-      price_sisa_berat:
-        autofill && hasDeliveryOrders
-          ? delivery?.price_sisa_berat
-          : so.price_sisa_berat,
-      week: autofill && hasDeliveryOrders ? delivery?.week : so.week,
+      uom: autofill ? so.uom : delivery?.uom,
+      weight_per_convertion: autofill
+        ? so.weight_per_convertion
+        : delivery?.weight_per_convertion,
+      price_per_convertion: autofill
+        ? so.price_per_convertion
+        : delivery?.price_per_convertion,
+      convertion_unit: autofill
+        ? so.convertion_unit
+        : delivery?.convertion_unit,
+      marketing_type: autofill ? so.marketing_type : delivery?.marketing_type,
+      total_peti: autofill ? so.total_peti : delivery?.total_peti,
+      price_per_qty: autofill ? so.price_per_qty : delivery?.price_per_qty,
+      sisa_berat: autofill ? so.sisa_berat : delivery?.sisa_berat,
+      price_sisa_berat: autofill
+        ? so.price_sisa_berat
+        : delivery?.price_sisa_berat,
+      week: autofill ? so.week : delivery?.week,
     } as DeliveryOrderProductFormValues;
   });
 };

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

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import {
   DeliveryOrderProductFormValues,
   DeliveryOrderProductSchema,
@@ -32,63 +32,6 @@ import Dropdown from '@/components/Dropdown';
 import { Icon } from '@iconify/react';
 import { handleMarketingCalculation } from '@/lib/marketing-calculation';
 
-type PricingOption =
-  | string
-  | {
-      value: string;
-      label: string;
-    }
-  | null
-  | undefined;
-
-type PricingSource =
-  | {
-      marketing_type?: PricingOption;
-      convertion_unit?: PricingOption;
-      total_price?: string | number | null;
-      qty?: string | number | null;
-      total_weight?: string | number | null;
-      unit_price?: string | number | null;
-      price_per_qty?: number | null;
-    }
-  | null
-  | undefined;
-
-const getOptionValue = (value?: PricingOption) => {
-  if (!value) return undefined;
-  if (typeof value === 'string') return value.toLowerCase();
-
-  return value.value?.toLowerCase();
-};
-
-const isTelurQtyProduct = (value?: PricingSource) =>
-  getOptionValue(value?.marketing_type) === 'telur' &&
-  getOptionValue(value?.convertion_unit) === 'qty';
-
-const getDisplayedUnitPrice = (value?: PricingSource) => {
-  if (
-    isTelurQtyProduct(value) &&
-    Number(value?.total_price || 0) > 0 &&
-    Number(value?.qty || 0) > 0
-  ) {
-    return Number(value?.total_price) / Number(value?.qty);
-  }
-
-  return value?.unit_price ?? undefined;
-};
-
-const getDisplayedPricePerQty = (value?: PricingSource) => {
-  if (
-    isTelurQtyProduct(value) &&
-    Number(value?.total_price || 0) > 0 &&
-    Number(value?.total_weight || 0) > 0
-  ) {
-    return Number(value?.total_price) / Number(value?.total_weight);
-  }
-
-  return value?.price_per_qty ?? null;
-};
-
 const DeliveryOrderProductForm = ({
   formState,
   salesOrders,
@@ -133,7 +76,7 @@ const DeliveryOrderProductForm = ({
       ? (Number(initialValues.total_price) -
           initialSisaBerat * Number(initialValues.unit_price || 0)) /
         Number(initialValues.total_peti)
-      : Number(initialValues?.unit_price || 0);
+      : 0;
 
   const initialPriceSisaBerat =
     initialValues?.total_price && initialValues?.total_peti
@@ -146,6 +89,15 @@ const DeliveryOrderProductForm = ({
   );
 
   // ============ Fetch Data ============
+  const { data: productData } = useSWR(
+    selectedProduct?.value
+      ? ProductApi.basePath + '/' + selectedProduct?.value
+      : null,
+    () =>
+      selectedProduct?.value
+        ? ProductApi.getSingle(Number(selectedProduct?.value))
+        : undefined
+  );
 
   // Options Week dari minggu 1 - 22
   // const optionsWeek = useMemo(() => {
@@ -160,7 +112,7 @@ const DeliveryOrderProductForm = ({
       if (!Boolean(item.qty)) {
         return {
           value: item.id,
-          label: `${item.marketing_product?.product_warehouse?.label} - ${item.marketing_product?.warehouse?.label ?? item.marketing_product?.kandang?.label}`,
+          label: `${item.marketing_product?.product_warehouse?.label} - ${item.marketing_product?.kandang?.label}`,
         } as OptionType;
       } else {
         return null;
@@ -181,19 +133,12 @@ const DeliveryOrderProductForm = ({
   const deliveryOrder = useMemo(() => {
     if (!hasDeliveryOrder || !deliveryOrders) return null;
 
-    const marketingProductId =
-      initialValues?.marketing_product_id ?? initialValues?.id;
-
     for (const doItem of deliveryOrders) {
-      const found =
-        doItem.deliveries.find(
-          (d) => d.marketing_product_id === marketingProductId
-        ) ??
-        doItem.deliveries.find(
-          (d) =>
-            d.product_warehouse.id ===
-            initialValues?.marketing_product?.product_warehouse_id
-        );
+      const found = doItem.deliveries.find(
+        (d) =>
+          d.product_warehouse.id ===
+          initialValues?.marketing_product?.product_warehouse_id
+      );
       if (found) {
         return {
           ...found,
@@ -209,27 +154,6 @@ const DeliveryOrderProductForm = ({
     (item) => item.id === initialValues?.marketing_product_id
   );
 
-  const defaultPricingSource: PricingSource = {
-    marketing_type:
-      initialValues?.marketing_type ?? salesOrder?.marketing_type ?? null,
-    convertion_unit:
-      initialValues?.convertion_unit ?? salesOrder?.convertion_unit ?? null,
-    total_price:
-      deliveryOrder?.total_price ??
-      initialValues?.total_price ??
-      salesOrder?.total_price,
-    qty: deliveryOrder?.qty ?? initialValues?.qty ?? salesOrder?.qty,
-    total_weight:
-      deliveryOrder?.total_weight ??
-      initialValues?.total_weight ??
-      salesOrder?.total_weight,
-    unit_price:
-      deliveryOrder?.unit_price ??
-      initialValues?.unit_price ??
-      salesOrder?.unit_price,
-    price_per_qty: initialValues?.price_per_qty ?? null,
-  };
-
   const formik = useFormik<DeliveryOrderProductFormValues>({
     enableReinitialize: true,
     initialValues: {
@@ -243,7 +167,8 @@ const DeliveryOrderProductForm = ({
         undefined,
       marketing_product_id:
         salesOrder?.id || initialValues?.marketing_product_id || undefined,
-      unit_price: getDisplayedUnitPrice(defaultPricingSource),
+      unit_price:
+        deliveryOrder?.unit_price ?? initialValues?.unit_price ?? undefined,
       total_weight:
         deliveryOrder?.total_weight ?? initialValues?.total_weight ?? undefined,
       qty: deliveryOrder?.qty ?? initialValues?.qty ?? undefined,
@@ -261,7 +186,7 @@ const DeliveryOrderProductForm = ({
       convertion_unit: initialValues?.convertion_unit || null,
       marketing_type: initialValues?.marketing_type || null,
       total_peti: initialValues?.total_peti ?? null,
-      price_per_qty: getDisplayedPricePerQty(defaultPricingSource),
+      price_per_qty: initialValues?.price_per_qty ?? null,
       sisa_berat: initialSisaBerat,
       price_sisa_berat: initialPriceSisaBerat,
       week: initialValues?.week ?? null,
@@ -299,6 +224,8 @@ const DeliveryOrderProductForm = ({
     },
   });
 
+  const { resetForm } = formik;
+
   const hasWeekField = useMemo(() => {
     const marketingType = formik.values.marketing_type?.value?.toLowerCase();
     if (marketingType === 'ayam_pullet') {
@@ -318,9 +245,9 @@ const DeliveryOrderProductForm = ({
     return false;
   }, [formik.values.marketing_product, formik.values.marketing_type]);
 
-  const handleResetForm = () => {
+  const handleResetForm = useCallback(() => {
     setFormErrorMessage('');
-    formik.resetForm({
+    resetForm({
       values: {
         delivery_date: '',
         vehicle_number: '',
@@ -344,17 +271,20 @@ const DeliveryOrderProductForm = ({
       },
     });
     // setSelectedProduct(null);
-  };
+  }, [resetForm]);
 
-  const handleBlurField = (field: string) => {
-    setCurrentInput(field);
+  const handleBlurField = useCallback(
+    (field: string) => {
+      setCurrentInput(field);
 
-    handleMarketingCalculation(field, {
-      values: formik.values,
-      setFieldValue: formik.setFieldValue,
-      hasSisaBerat,
-    });
-  };
+      handleMarketingCalculation(field, {
+        values: formik.values,
+        setFieldValue: formik.setFieldValue,
+        hasSisaBerat,
+      });
+    },
+    [formik.values, formik.setFieldValue, hasSisaBerat]
+  );
 
   // 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 = (
@@ -399,28 +329,25 @@ const DeliveryOrderProductForm = ({
 
   const { setValues: setFormikValues } = formik;
 
+  const processedInitialValuesRef = useRef<number | null>(null);
   useEffect(() => {
     if (initialValues) {
-      if (
-        !Boolean(initialValues.qty) &&
-        !Boolean(initialValues.marketing_product_id)
-      ) {
+      if (processedInitialValuesRef.current === initialValues.id) return;
+      processedInitialValuesRef.current = initialValues.id as number;
+
+      if (!Boolean(initialValues.qty)) {
         handleResetForm();
       } else {
-        setFormikValues({
-          ...initialValues,
-          unit_price: getDisplayedUnitPrice(initialValues),
-          price_per_qty: getDisplayedPricePerQty(initialValues),
-        });
+        setFormikValues(initialValues);
         if (initialValues?.marketing_product_id) {
           setSelectedProduct({
-            value: initialValues?.marketing_product_id,
-            label: `${initialValues?.marketing_product?.product_warehouse?.label} - ${initialValues?.marketing_product?.warehouse?.label ?? initialValues?.marketing_product?.kandang?.label}`,
+            value: initialValues?.id,
+            label: `${initialValues?.marketing_product?.product_warehouse?.label} - ${initialValues?.marketing_product?.kandang?.label}`,
           } as OptionType);
         }
       }
     }
-  }, [initialValues]);
+  }, [handleResetForm, initialValues, setFormikValues]);
 
   // ===== Formik Error List =====
   const { formErrorList, close, handleFormSubmit } = useFormikErrorList(
@@ -431,16 +358,17 @@ const DeliveryOrderProductForm = ({
         handleBlurField(currentInput);
         formik.setFieldValue(
           'uom',
-          initialValues?.marketing_product?.product_warehouse_data?.product?.uom
-            ?.name ?? ''
+          isResponseSuccess(productData) ? productData?.data?.uom?.name : ''
         );
       },
     }
   );
 
   useEffect(() => {
-    handleBlurField('week');
-  }, [formik.values.week]);
+    if (formik.values.week) {
+      handleBlurField('week');
+    }
+  }, [formik.values.week, handleBlurField]);
 
   return (
     <>
@@ -541,11 +469,10 @@ const DeliveryOrderProductForm = ({
                 marketing_product_id: selected.value as number,
                 marketing_product: soFieldValues,
                 qty: so.qty,
-                unit_price: getDisplayedUnitPrice(so),
+                unit_price: so.unit_price,
                 total_price: so.total_price,
                 avg_weight: so.avg_weight,
                 total_weight: so.total_weight,
-                price_per_qty: getDisplayedPricePerQty(so),
                 vehicle_number: so.vehicle_number,
                 week: soFieldValues.week ?? null,
               });
@@ -556,11 +483,7 @@ const DeliveryOrderProductForm = ({
                   text={
                     exisitingValues?.find(
                       (item) => item.id === selectedProduct?.value
-                    )?.marketing_product?.warehouse?.label ??
-                    exisitingValues?.find(
-                      (item) => item.id === selectedProduct?.value
-                    )?.marketing_product?.kandang?.label ??
-                    ''
+                    )?.marketing_product?.kandang?.label ?? ''
                   }
                   color='success'
                   className={{
@@ -726,7 +649,7 @@ const DeliveryOrderProductForm = ({
               placeholder='Masukan Total Peti'
               endAdornment={
                 <div className='flex items-center gap-2'>
-                  <span className='text-sm text-base-content/50'>Peti</span>
+                  <span className='text-sm text-base-content/50'>Kg</span>
                 </div>
               }
               bottomLabel={`1 ${formik.values.convertion_unit?.value.toLowerCase()} = ${formik.values.weight_per_convertion ?? 0} Kg`}
@@ -776,9 +699,6 @@ const DeliveryOrderProductForm = ({
               }
               errorMessage={formik.errors.total_weight}
               placeholder='Masukan Total Bobot'
-              disabled={
-                formik.values.convertion_unit?.value.toLowerCase() === 'peti'
-              }
             />
           )}
 
@@ -805,8 +725,9 @@ const DeliveryOrderProductForm = ({
             endAdornment={
               <div className='flex items-center gap-2'>
                 <span className='text-sm text-gray-500'>
-                  {initialValues?.marketing_product?.product_warehouse_data
-                    ?.product?.uom?.name ?? ''}
+                  {isResponseSuccess(productData)
+                    ? productData?.data?.uom.name
+                    : ''}
                 </span>
               </div>
             }
@@ -817,8 +738,9 @@ const DeliveryOrderProductForm = ({
                     (item) => item.id === formik.values.marketing_product_id
                   )?.qty +
                   ' ' +
-                  (initialValues?.marketing_product?.product_warehouse_data
-                    ?.product?.uom?.name ?? '')
+                  (isResponseSuccess(productData)
+                    ? productData?.data?.uom.name
+                    : '')
                 : ''
             }
           />
@@ -846,32 +768,12 @@ const DeliveryOrderProductForm = ({
             />
           )}
 
-          {/* Harga Satuan */}
-          {formik.values.convertion_unit?.value.toLowerCase() !== 'peti' &&
-            formik.values.convertion_unit?.value.toLowerCase() !== 'kg' && (
-              <NumberInput
-                required
-                label={`Harga / ${formik.values.convertion_unit?.label.toLowerCase() !== 'qty' ? 'Kg' : 'Butir'} (Rp)`}
-                name='unit_price'
-                value={formik.values.unit_price}
-                onChange={(e) => {
-                  const value = Number(e.target.value);
-                  handleFieldChange('unit_price', value, () =>
-                    setCurrentInput(e.target.name)
-                  );
-                }}
-                isError={Boolean(formik.errors.unit_price)}
-                errorMessage={formik.errors.unit_price}
-                placeholder='Masukan Harga Satuan'
-              />
-            )}
-
-          {/* Harga per kg untuk TELUR + QTY */}
+          {/* Harga per butir untuk TELUR + QTY */}
           {formik.values.marketing_type?.value.toLowerCase() === 'telur' &&
             formik.values.convertion_unit?.value.toLowerCase() === 'qty' && (
               <NumberInput
                 required
-                label='Harga / Kg (Rp)'
+                label='Harga / Butir (Rp)'
                 name='price_per_qty'
                 value={formik.values.price_per_qty ?? undefined}
                 onChange={(e) => {
@@ -885,7 +787,27 @@ const DeliveryOrderProductForm = ({
                   Boolean(formik.errors.price_per_qty)
                 }
                 errorMessage={formik.errors.price_per_qty}
-                placeholder='Masukan Harga per Kg'
+                placeholder='Masukan Harga per Butir'
+              />
+            )}
+
+          {/* Harga Satuan */}
+          {formik.values.convertion_unit?.value.toLowerCase() !== 'peti' &&
+            formik.values.convertion_unit?.value.toLowerCase() !== 'kg' && (
+              <NumberInput
+                required
+                label={`Harga / ${isResponseSuccess(productData) ? productData?.data?.uom?.name : 'Produk'} (Rp)`}
+                name='unit_price'
+                value={formik.values.unit_price}
+                onChange={(e) => {
+                  const value = Number(e.target.value);
+                  handleFieldChange('unit_price', value, () =>
+                    setCurrentInput(e.target.name)
+                  );
+                }}
+                isError={Boolean(formik.errors.unit_price)}
+                errorMessage={formik.errors.unit_price}
+                placeholder='Masukan Harga Satuan'
               />
             )}
 

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

@@ -3,11 +3,6 @@ import * as Yup from 'yup';
 
 type SalesOrderProductSchemaType = {
   id?: number | undefined;
-  warehouse_id?: number;
-  warehouse?: {
-    value: number;
-    label: string;
-  } | null;
   kandang_id?: number;
   kandang?: {
     value: number;
@@ -49,22 +44,15 @@ export const SalesOrderProductSchema: Yup.ObjectSchema<SalesOrderProductSchemaTy
   Yup.object({
     id: Yup.number(),
     vehicle_number: Yup.string().required('Nomor Kendaraan wajib diisi!'),
-    warehouse: Yup.object({
-      value: Yup.number()
-        .min(1, 'Gudang fisik wajib diisi!')
-        .required('Gudang fisik wajib diisi!'),
-      label: Yup.string().required('Gudang fisik wajib diisi!'),
-    }).nullable(),
-    warehouse_id: Yup.number()
-      .min(1, 'Gudang fisik wajib diisi!')
-      .required('Gudang fisik wajib diisi!'),
     kandang: Yup.object({
-      value: Yup.number().min(1).required(),
-      label: Yup.string().required(),
-    })
-      .nullable()
-      .optional(),
-    kandang_id: Yup.number().optional(),
+      value: Yup.number()
+        .min(1, 'Kandang wajib diisi!')
+        .required('Kandang wajib diisi!'),
+      label: Yup.string().required('Kandang wajib diisi!'),
+    }).nullable(),
+    kandang_id: Yup.number()
+      .min(1, 'Kandang wajib diisi!')
+      .required('Kandang wajib diisi!'),
     product_warehouse: Yup.object({
       value: Yup.number()
         .min(1, 'Produk wajib diisi!')

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

@@ -5,9 +5,9 @@ import {
   SalesOrderProductFormValues,
   SalesOrderProductSchema,
 } from '@/components/pages/marketing/form/repeater/sales-order/SalesOrderProduct.schema';
-import { RefObject, useEffect, useMemo, useState } from 'react';
+import { RefObject, useCallback, useEffect, useMemo, useState } from 'react';
 import { OptionType, useSelect } from '@/components/input/SelectInput';
-import { Warehouse } from '@/types/api/master-data/warehouse';
+import { Kandang } from '@/types/api/master-data/kandang';
 import { WarehouseApi } from '@/services/api/master-data';
 import { ProductWarehouse } from '@/types/api/inventory/product-warehouse';
 import { ProductWarehouseApi } from '@/services/api/inventory';
@@ -31,7 +31,6 @@ import {
 import { Icon } from '@iconify/react';
 import Dropdown from '@/components/Dropdown';
 import { handleMarketingCalculation } from '@/lib/marketing-calculation';
-import { getProductWarehouseOptionLabel } from '@/lib/product-warehouse';
 
 const SalesOrderProductForm = ({
   initialValues,
@@ -68,25 +67,7 @@ const SalesOrderProductForm = ({
       ? (Number(initialValues.total_price) -
           initialSisaBerat * Number(initialValues.unit_price || 0)) /
         Number(initialValues.total_peti)
-      : Number(initialValues?.unit_price || 0);
-
-  const isInitialTelurQty =
-    initialValues?.marketing_type?.value?.toLowerCase() === 'telur' &&
-    initialValues?.convertion_unit?.value?.toLowerCase() === 'qty';
-
-  const initialUnitPrice =
-    isInitialTelurQty &&
-    Number(initialValues?.total_price || 0) > 0 &&
-    Number(initialValues?.qty || 0) > 0
-      ? Number(initialValues?.total_price) / Number(initialValues?.qty)
-      : initialValues?.unit_price || '';
-
-  const initialPricePerQty =
-    isInitialTelurQty &&
-    Number(initialValues?.total_price || 0) > 0 &&
-    Number(initialValues?.total_weight || 0) > 0
-      ? Number(initialValues?.total_price) / Number(initialValues?.total_weight)
-      : (initialValues?.price_per_qty ?? null);
+      : 0;
 
   const initialPriceSisaBerat =
     initialValues?.total_price && initialValues?.total_peti
@@ -103,15 +84,11 @@ const SalesOrderProductForm = ({
     enableReinitialize: true,
     initialValues: {
       vehicle_number: initialValues?.vehicle_number || '',
-      warehouse_id:
-        initialValues?.warehouse_id ?? initialValues?.kandang_id ?? undefined,
-      warehouse: initialValues?.warehouse ?? initialValues?.kandang ?? null,
       kandang_id: initialValues?.kandang_id || undefined,
       kandang: initialValues?.kandang || null,
       product_warehouse: initialValues?.product_warehouse || null,
-      product_warehouse_data: initialValues?.product_warehouse_data || null,
       product_warehouse_id: initialValues?.product_warehouse_id || undefined,
-      unit_price: initialUnitPrice,
+      unit_price: initialValues?.unit_price || '',
       total_weight: initialValues?.total_weight || '',
       qty: initialValues?.qty || '',
       avg_weight: initialValues?.avg_weight || '',
@@ -125,7 +102,7 @@ const SalesOrderProductForm = ({
       convertion_unit: initialValues?.convertion_unit || null,
       marketing_type: initialValues?.marketing_type || null,
       total_peti: initialValues?.total_peti ?? null,
-      price_per_qty: initialPricePerQty,
+      price_per_qty: initialValues?.price_per_qty ?? null,
       sisa_berat: initialSisaBerat,
       price_sisa_berat: initialPriceSisaBerat,
       week: initialValues?.week ?? null,
@@ -155,11 +132,11 @@ const SalesOrderProductForm = ({
 
   // ===== Options =====
   const {
-    options: warehouseOptions,
-    isLoadingOptions: isLoadingWarehouseOptions,
-    setInputValue: setWarehouseSearchValue,
-    loadMore: loadMoreWarehouses,
-  } = useSelect<Warehouse>(WarehouseApi.basePath, 'id', 'name');
+    options: kandangSourceOptions,
+    isLoadingOptions: isLoadingKandangSourceOptions,
+    setInputValue: setKandangInputValue,
+    loadMore: loadMoreKandang,
+  } = useSelect<Kandang>(WarehouseApi.basePath, 'id', 'name');
 
   // Options Week dari minggu 1 - 22
   // const optionsWeek = useMemo(() => {
@@ -170,6 +147,7 @@ const SalesOrderProductForm = ({
   // }, []);
 
   const {
+    options: warehouseSourceOptions,
     rawData: warehouseSourceRawData,
     isLoadingOptions: isLoadingWarehouseSourceOptions,
     setInputValue: setWarehouseInputValue,
@@ -178,69 +156,32 @@ const SalesOrderProductForm = ({
     ProductWarehouseApi.basePath,
     'id',
     'product.name',
-    'search',
+    '',
     {
-      limit: '100',
-      available_only: 'true',
-      warehouse_id: formik.values.warehouse_id?.toString() ?? '',
+      warehouse_id: formik.values.kandang_id?.toString() ?? '',
       type: formik.values.marketing_type?.value.toLocaleUpperCase() ?? '',
     }
   );
 
   const productOptionsFiltered = useMemo(() => {
-    if (!isResponseSuccess(warehouseSourceRawData)) {
-      return initialValues?.product_warehouse
-        ? [initialValues.product_warehouse]
-        : [];
-    }
-
-    const selectedProductIds = new Set(
-      exisitingValues
-        ?.filter((item) => item.id !== initialValues?.id)
-        .map((item) => Number(item.product_warehouse_id))
-        .filter((item) => item > 0) ?? []
+    return warehouseSourceOptions.filter(
+      (product) =>
+        !exisitingValues
+          ?.map((item) => item.product_warehouse_id)
+          .includes(product.value)
     );
-
-    const options = warehouseSourceRawData.data
-      .filter((item: ProductWarehouse) => !selectedProductIds.has(item.id))
-      .map((item: ProductWarehouse) => ({
-        value: item.id,
-        label: getProductWarehouseOptionLabel(item),
-      }));
-
-    if (
-      initialValues?.product_warehouse &&
-      initialValues?.product_warehouse_id
-    ) {
-      const exists = options.find(
-        (option) =>
-          Number(option.value) === Number(initialValues.product_warehouse_id)
-      );
-      if (!exists) {
-        options.push(initialValues.product_warehouse);
-      }
-    }
-
-    return options;
-  }, [warehouseSourceRawData, exisitingValues, initialValues]);
+  }, [warehouseSourceOptions, exisitingValues]);
 
   // ===== Handler =====
-  const warehouseChangeHandler = (val: OptionType | OptionType[] | null) => {
-    const warehouse = (val as OptionType | null) ?? null;
-
-    formik.setFieldValue('warehouse', warehouse);
-    formik.setFieldValue('warehouse_id', warehouse?.value);
-    formik.setFieldValue('kandang', warehouse);
-    formik.setFieldValue('kandang_id', warehouse?.value);
+  const kandangChangeHandler = (val: OptionType | OptionType[] | null) => {
+    formik.setFieldValue('kandang', val as OptionType);
+    formik.setFieldValue('kandang_id', (val as OptionType)?.value);
     formik.setFieldValue('product_warehouse_id', null);
     formik.setFieldValue('product_warehouse', null);
-    formik.setFieldValue('product_warehouse_data', null);
     formik.setFieldValue('qty', '');
   };
 
-  const productWarehouseChangeHandler = (
-    val: OptionType | OptionType[] | null
-  ) => {
+  const warehouseChangeHandler = (val: OptionType | OptionType[] | null) => {
     formik.setFieldValue('product_warehouse', val as OptionType);
     const newId = (val as OptionType)?.value;
     formik.setFieldValue('product_warehouse_id', newId);
@@ -250,13 +191,7 @@ const SalesOrderProductForm = ({
         (item: ProductWarehouse) => item.id === newId
       );
       setSelectedProductWarehouse(productWarehouse || null);
-      formik.setFieldValue('product_warehouse_data', productWarehouse || null);
       formik.setFieldValue('qty', productWarehouse?.quantity);
-
-      if (productWarehouse?.quantity) {
-        handleFieldChange('qty', productWarehouse?.quantity);
-      }
-
       formik.setFieldValue('uom', productWarehouse?.product?.uom?.name || '');
       if (
         productWarehouse?.week !== undefined &&
@@ -269,8 +204,6 @@ const SalesOrderProductForm = ({
       }
       handleBlurField('qty');
     } else {
-      setSelectedProductWarehouse(null);
-      formik.setFieldValue('product_warehouse_data', null);
       formik.setFieldValue('qty', '');
       formik.setFieldValue('uom', '');
       formik.setFieldValue('week', null);
@@ -284,12 +217,9 @@ const SalesOrderProductForm = ({
     formik.resetForm({
       values: {
         vehicle_number: '',
-        warehouse_id: undefined,
-        warehouse: null,
         kandang_id: undefined,
         kandang: null,
         product_warehouse: null,
-        product_warehouse_data: null,
         product_warehouse_id: undefined,
         unit_price: '',
         total_weight: '',
@@ -310,15 +240,18 @@ const SalesOrderProductForm = ({
     });
   };
 
-  const handleBlurField = (field: string) => {
-    setCurrentInput(field);
+  const handleBlurField = useCallback(
+    (field: string) => {
+      setCurrentInput(field);
 
-    handleMarketingCalculation(field, {
-      values: formik.values,
-      setFieldValue: formik.setFieldValue,
-      hasSisaBerat,
-    });
-  };
+      handleMarketingCalculation(field, {
+        values: formik.values,
+        setFieldValue: formik.setFieldValue,
+        hasSisaBerat,
+      });
+    },
+    [formik.values, formik.setFieldValue, hasSisaBerat]
+  );
 
   // 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 = (
@@ -377,12 +310,10 @@ const SalesOrderProductForm = ({
   );
 
   useEffect(() => {
-    handleBlurField('week');
-  }, [formik.values.week]);
-
-  useEffect(() => {
-    setSelectedProductWarehouse(initialValues?.product_warehouse_data || null);
-  }, [initialValues?.product_warehouse_data]);
+    if (formik.values.week) {
+      handleBlurField('week');
+    }
+  }, [formik.values.week, handleBlurField]);
 
   return (
     <>
@@ -422,22 +353,22 @@ const SalesOrderProductForm = ({
             errorMessage={formik.errors.vehicle_number}
           />
 
-          {/* Gudang Fisik */}
+          {/* Gudang */}
           <SelectInputRadio
             required
-            label='Gudang Fisik'
-            options={warehouseOptions}
-            isLoading={isLoadingWarehouseOptions}
-            value={formik.values.warehouse}
-            onChange={warehouseChangeHandler}
+            label='Gudang'
+            options={kandangSourceOptions}
+            isLoading={isLoadingKandangSourceOptions}
+            value={formik.values.kandang}
+            onChange={kandangChangeHandler}
             isClearable
-            onInputChange={setWarehouseSearchValue}
-            onMenuScrollToBottom={loadMoreWarehouses}
+            onInputChange={setKandangInputValue}
+            onMenuScrollToBottom={loadMoreKandang}
             isError={
-              formik.touched.warehouse_id && Boolean(formik.errors.warehouse_id)
+              formik.touched.kandang_id && Boolean(formik.errors.kandang_id)
             }
-            errorMessage={formik.errors.warehouse_id}
-            placeholder='Pilih Gudang Fisik'
+            errorMessage={formik.errors.kandang_id}
+            placeholder='Pilih Gudang'
           />
 
           {/* Kategori */}
@@ -448,9 +379,8 @@ const SalesOrderProductForm = ({
             value={formik.values.marketing_type}
             onChange={(val) => {
               formik.setFieldValue('marketing_type', val);
-              productWarehouseChangeHandler(null);
+              warehouseChangeHandler(null);
               formik.setFieldValue('product_warehouse', null);
-              formik.setFieldValue('product_warehouse_data', null);
               formik.setFieldValue('product_warehouse_id', null);
               formik.setFieldValue('convertion_unit', null);
               formik.setFieldValue('weight_per_convertion', null);
@@ -467,18 +397,18 @@ const SalesOrderProductForm = ({
             options={productOptionsFiltered}
             isLoading={isLoadingWarehouseSourceOptions}
             value={formik.values.product_warehouse}
-            onChange={productWarehouseChangeHandler}
+            onChange={warehouseChangeHandler}
             onInputChange={setWarehouseInputValue}
             onMenuScrollToBottom={loadMoreWarehouse}
             isClearable
             placeholder={
-              formik.values.warehouse_id
+              formik.values.kandang_id
                 ? productOptionsFiltered.length == 0
                   ? 'Tidak ada produk yang tersedia'
                   : 'Pilih produk'
-                : 'Pilih Gudang Fisik Terlebih Dahulu'
+                : 'Pilih Kandang Terlebih Dahulu'
             }
-            isDisabled={!formik.values.warehouse_id}
+            isDisabled={!formik.values.kandang_id}
             isError={
               formik.touched.product_warehouse_id &&
               Boolean(formik.errors.product_warehouse_id)
@@ -546,7 +476,7 @@ const SalesOrderProductForm = ({
                               <input
                                 type='radio'
                                 checked={
-                                  formik.values.convertion_unit?.value.toLowerCase() ===
+                                  formik.values.convertion_unit?.value ===
                                   option.value
                                 }
                                 onChange={() => null}
@@ -569,9 +499,7 @@ const SalesOrderProductForm = ({
                     } per ${formik.values.convertion_unit?.value}`}
                     value={formik.values.weight_per_convertion ?? ''}
                     onChange={(e) => {
-                      const value = Number(e.target.value)
-                        ? Number(e.target.value)
-                        : '';
+                      const value = Number(e.target.value);
                       handleFieldChange('weight_per_convertion', value, () =>
                         setCurrentInput(e.target.name)
                       );
@@ -625,7 +553,7 @@ const SalesOrderProductForm = ({
               placeholder='Masukan Total Peti'
               endAdornment={
                 <div className='flex items-center gap-2'>
-                  <span className='text-sm text-base-content/50'>Peti</span>
+                  <span className='text-sm text-base-content/50'>Kg</span>
                 </div>
               }
               bottomLabel={`1 ${formik.values.convertion_unit?.value.toLowerCase()} = ${formik.values.weight_per_convertion ?? 0} Kg`}
@@ -675,9 +603,6 @@ const SalesOrderProductForm = ({
               }
               errorMessage={formik.errors.total_weight}
               placeholder='Masukan Total Bobot'
-              disabled={
-                formik.values.convertion_unit?.value.toLowerCase() === 'peti'
-              }
             />
           )}
 
@@ -745,34 +670,12 @@ const SalesOrderProductForm = ({
             />
           )}
 
-          {/* Harga Satuan per Uom Produk Warehouse */}
-          {formik.values.convertion_unit?.value.toLowerCase() !== 'peti' &&
-            formik.values.convertion_unit?.value.toLowerCase() !== 'kg' && (
-              <NumberInput
-                required
-                label={`Harga / ${formik.values.convertion_unit?.label.toLowerCase() !== 'qty' ? 'Kg' : 'Butir'} (Rp)`}
-                name='unit_price'
-                value={formik.values.unit_price}
-                onChange={(e) => {
-                  const value = Number(e.target.value);
-                  handleFieldChange('unit_price', value, () =>
-                    setCurrentInput(e.target.name)
-                  );
-                }}
-                isError={
-                  formik.touched.unit_price && Boolean(formik.errors.unit_price)
-                }
-                errorMessage={formik.errors.unit_price}
-                placeholder='Masukan Harga Satuan...'
-              />
-            )}
-
-          {/* Harga per kg untuk TELUR + QTY */}
+          {/* Harga per butir untuk TELUR + QTY */}
           {formik.values.marketing_type?.value.toLowerCase() === 'telur' &&
             formik.values.convertion_unit?.value.toLowerCase() === 'qty' && (
               <NumberInput
                 required
-                label='Harga / Kg (Rp)'
+                label='Harga / Butir (Rp)'
                 name='price_per_qty'
                 value={formik.values.price_per_qty ?? undefined}
                 onChange={(e) => {
@@ -786,7 +689,29 @@ const SalesOrderProductForm = ({
                   Boolean(formik.errors.price_per_qty)
                 }
                 errorMessage={formik.errors.price_per_qty}
-                placeholder='Masukan Harga per Kg'
+                placeholder='Masukan Harga per Butir'
+              />
+            )}
+
+          {/* Harga Satuan per Uom Produk Warehouse */}
+          {formik.values.convertion_unit?.value.toLowerCase() !== 'peti' &&
+            formik.values.convertion_unit?.value.toLowerCase() !== 'kg' && (
+              <NumberInput
+                required
+                label={`Harga / ${formik.values.convertion_unit?.label !== 'qty' ? 'Kg' : (selectedProductWarehouse?.product?.uom?.name ?? 'Produk')} (Rp)`}
+                name='unit_price'
+                value={formik.values.unit_price}
+                onChange={(e) => {
+                  const value = Number(e.target.value);
+                  handleFieldChange('unit_price', value, () =>
+                    setCurrentInput(e.target.name)
+                  );
+                }}
+                isError={
+                  formik.touched.unit_price && Boolean(formik.errors.unit_price)
+                }
+                errorMessage={formik.errors.unit_price}
+                placeholder='Masukan Harga Satuan'
               />
             )}
 

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

@@ -5,9 +5,8 @@ import { Icon } from '@iconify/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';
-import { DeliveryProductToFieldValues } from '@/components/pages/marketing/form/MarketingForm.schema';
 
 type DeliveryOrderProductTableProps = {
   data: DeliveryOrderProductFormValues[];
@@ -56,17 +55,14 @@ const DeliveryOrderProductTable = ({
 
   const deliveryItems = useMemo(() => {
     if (!hasDeliveryOrder) return [];
-
     return (
       marketing?.delivery_order?.flatMap((doItem) =>
-        DeliveryProductToFieldValues(marketing?.sales_order, doItem).map(
-          (delivery) => ({
-            ...delivery,
-            do_number: doItem.do_number,
-            delivery_date: doItem.delivery_date,
-            warehouse: doItem.warehouse,
-          })
-        )
+        doItem.deliveries.map((delivery) => ({
+          ...delivery,
+          do_number: doItem.do_number,
+          delivery_date: doItem.delivery_date,
+          warehouse: doItem.warehouse,
+        }))
       ) ?? []
     );
   }, [marketing?.delivery_order, hasDeliveryOrder]);
@@ -85,7 +81,7 @@ const DeliveryOrderProductTable = ({
           <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>
-              {/* {formType !== 'success' &&
+              {formType !== 'success' &&
                 (formType === 'add_delivery' ||
                   formType === 'edit_delivery' ||
                   formType === 'detail') && (
@@ -102,16 +98,15 @@ const DeliveryOrderProductTable = ({
                       <Icon icon='heroicons:pencil' width={20} height={20} />
                     </Button>
                   </div>
-                )} */}
+                )}
             </div>
           </th>
         </tr>
         <>
           <tr>
-            <td className='text-sm px-4 py-3'>Gudang Fisik</td>
+            <td className='text-sm px-4 py-3'>Gudang</td>
             <td className='text-sm px-4 py-3'>
               {doItem?.warehouse?.name ||
-                item.marketing_product?.warehouse?.label ||
                 item.marketing_product?.product_warehouse_data?.warehouse?.name}
             </td>
           </tr>
@@ -124,7 +119,7 @@ const DeliveryOrderProductTable = ({
           <tr>
             <td className='text-sm px-4 py-3'>Qty</td>
             <td className='text-sm px-4 py-3'>
-              {item.qty !== undefined && item.qty !== null && item.qty !== ''
+              {item.qty
                 ? `${formatNumber(parseFloat(item.qty as string))} ${item.marketing_product?.uom ?? ''}`
                 : '-'}
             </td>
@@ -141,15 +136,12 @@ const DeliveryOrderProductTable = ({
             <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))} Kg
+                {formatNumber(Number(item.total_weight))}
               </td>
             </tr>
           )}
           <tr>
-            <td className='text-sm px-4 py-3'>
-              Total Harga Satuan
-              {item.convertion_unit?.label.toLowerCase() === 'peti' && ' (Kg)'}
-            </td>
+            <td className='text-sm px-4 py-3'>Total Harga Satuan</td>
             <td className='text-sm px-4 py-3'>
               {formatCurrency(parseFloat(item.unit_price as string))}
             </td>
@@ -219,7 +211,7 @@ const DeliveryOrderProductTable = ({
   };
 
   const renderDeliveryOrderContent = (
-    item: DeliveryOrderProductFormValues & {
+    item: BaseDelivery & {
       do_number: string;
       delivery_date: string;
       warehouse: Warehouse;
@@ -238,43 +230,25 @@ const DeliveryOrderProductTable = ({
           <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>
-              {formType !== 'success' &&
-                (formType === 'add_delivery' ||
-                  formType === 'edit_delivery' ||
-                  formType === 'detail') && (
-                  <div className='flex flex-row gap-1.5 items-center'>
-                    <Button
-                      type='button'
-                      variant='ghost'
-                      color='none'
-                      onClick={() => {
-                        onEditRef.current(item.id as number, item);
-                      }}
-                      className='p-0 hover:text-base-content'
-                    >
-                      <Icon icon='heroicons:pencil' width={20} height={20} />
-                    </Button>
-                  </div>
-                )}
             </div>
           </th>
         </tr>
         <>
           <tr>
-            <td className='text-sm px-4 py-3'>Gudang Fisik</td>
+            <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.marketing_product?.product_warehouse_data?.product.name}
+              {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 !== undefined && item.qty !== null && item.qty !== ''
-                ? `${formatNumber(Number(item.qty))} ${item.marketing_product?.product_warehouse_data?.product.uom.name ?? ''}`
+              {item.qty
+                ? `${formatNumber(item.qty)} ${item.product_warehouse?.product?.uom?.name ?? ''}`
                 : '-'}
             </td>
           </tr>
@@ -297,13 +271,13 @@ const DeliveryOrderProductTable = ({
           <tr>
             <td className='text-sm px-4 py-3'>Total Harga Satuan</td>
             <td className='text-sm px-4 py-3'>
-              {formatCurrency(Number(item.unit_price))}
+              {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(Number(item.total_price))}
+              {formatCurrency(item.total_price)}
             </td>
           </tr>
         </>
@@ -359,9 +333,7 @@ const DeliveryOrderProductTable = ({
       <div className='size-full flex flex-col relative overflow-x-hidden gap-3'>
         {hasDeliveryOrder
           ? deliveryItems.map((item, index) => (
-              <div
-                key={`do-table-${item.marketing_product?.product_warehouse?.value}-${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
@@ -377,11 +349,8 @@ const DeliveryOrderProductTable = ({
                   </div>
                 ) : (
                   <Card
-                    key={`do-table-${item.marketing_product?.product_warehouse?.value}-${index}`}
-                    title={
-                      item.marketing_product?.product_warehouse_data?.product
-                        .name || 'Produk'
-                    }
+                    key={`do-table-${item.product_warehouse?.id}-${index}`}
+                    title={item.product_warehouse?.product?.name || 'Produk'}
                     collapsible={true}
                     defaultCollapsed={false}
                     variant='bordered'

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

@@ -73,10 +73,8 @@ const SalesOrderProductTable = ({
           <td className='text-sm px-4 py-3'>{item.vehicle_number}</td>
         </tr>
         <tr>
-          <td className='text-sm px-4 py-3'>Gudang Fisik</td>
-          <td className='text-sm px-4 py-3'>
-            {item.warehouse?.label ?? item.kandang?.label}
-          </td>
+          <td className='text-sm px-4 py-3'>Gudang</td>
+          <td className='text-sm px-4 py-3'>{item.kandang?.label}</td>
         </tr>
         <tr>
           <td className='text-sm px-4 py-3'>Kategori</td>
@@ -137,22 +135,8 @@ const SalesOrderProductTable = ({
             {`${formatNumber(parseFloat(item.qty as string))} ${item.uom || ''}`}
           </td>
         </tr>
-        {item.convertion_unit?.value.toLowerCase() === 'peti' && (
-          <tr>
-            <td className='text-sm px-4 py-3'>Harga Satuan Per Peti</td>
-            <td className='text-sm px-4 py-3'>
-              {formatCurrency(
-                parseFloat(item.unit_price as string) *
-                  parseFloat(String(item.weight_per_convertion))
-              )}
-            </td>
-          </tr>
-        )}
         <tr>
-          <td className='text-sm px-4 py-3'>
-            Harga Satuan
-            {item.convertion_unit?.value.toLowerCase() === 'peti' && ' (Kg)'}
-          </td>
+          <td className='text-sm px-4 py-3'>Harga Satuan</td>
           <td className='text-sm px-4 py-3'>
             {formatCurrency(parseFloat(item.unit_price as string))}
           </td>

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

@@ -6,7 +6,6 @@ import { useMemo, useState } from 'react';
 import { formatDate, formatNumber, formatVechicleNumber } from '@/lib/helper';
 import pdfStyles from '@/components/pages/marketing/pdf/styles/MarketingPDFStyles';
 import toast from 'react-hot-toast';
-import { useSearchParams } from 'next/navigation';
 
 interface DeliveryOrderExportProps {
   data?: Marketing;
@@ -20,9 +19,6 @@ const DeliveryOrderExport = ({
 }: DeliveryOrderExportProps) => {
   const [isGeneratingPDF, setIsGeneratingPDF] = useState(false);
   const salesData = data;
-  const searchParams = useSearchParams();
-  const action = searchParams.get('action');
-  const id = searchParams.get('id');
 
   const handleDownloadPDF = async () => {
     if (!salesData) {
@@ -53,7 +49,6 @@ const DeliveryOrderExport = ({
       toast.error('Failed to generate PDF. Please try again.');
     } finally {
       setIsGeneratingPDF(false);
-      window.location.href = `/marketing?action=${action}&id=${id}`;
     }
   };
 
@@ -92,7 +87,7 @@ const PDFDocument = ({
     return (
       deliveryOrder.deliveries?.reduce((a, b) => a + b.total_price, 0) ?? 0
     );
-  }, []);
+  }, [deliveryOrder.deliveries]);
 
   return (
     <Document>
@@ -101,8 +96,8 @@ const PDFDocument = ({
         <View style={pdfStyles.header}>
           <Text style={pdfStyles.companyInfo}>PT LUMBUNG TELUR INDONESIA</Text>
           <Text style={pdfStyles.address}>
-            Setra Duta Raya No.L3 No.7, Ciwaruga, Kec. Parongpong, Kabupaten
-            Bandung Barat, Jawa Barat 40514
+            SOHO Building Lt.3 (Paris Van Java), Jalan Karang Tinggal, Kel.
+            Cipedes, Kec. Sukajadi, Kota Bandung 40162
           </Text>
           <View style={pdfStyles.divider} />
         </View>

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

@@ -6,7 +6,6 @@ import { useMemo, useState } from 'react';
 import { formatDate, formatNumber } from '@/lib/helper';
 import pdfStyles from '@/components/pages/marketing/pdf/styles/MarketingPDFStyles';
 import toast from 'react-hot-toast';
-import { useSearchParams } from 'next/navigation';
 
 interface SalesOrderExportProps {
   data?: Marketing;
@@ -16,9 +15,6 @@ interface SalesOrderExportProps {
 const SalesOrderExport = ({ data }: SalesOrderExportProps) => {
   const [isGeneratingPDF, setIsGeneratingPDF] = useState(false);
   const salesData = data;
-  const searchParams = useSearchParams();
-  const action = searchParams.get('action');
-  const id = searchParams.get('id');
 
   const handleDownloadPDF = async () => {
     if (!salesData) {
@@ -47,7 +43,6 @@ const SalesOrderExport = ({ data }: SalesOrderExportProps) => {
       toast.error('Failed to generate PDF. Please try again.');
     } finally {
       setIsGeneratingPDF(false);
-      window.location.href = `/marketing?action=${action}&id=${id}`;
     }
   };
 
@@ -87,8 +82,8 @@ const PDFDocument = ({ data }: { data: Marketing }) => {
         <View style={pdfStyles.header}>
           <Text style={pdfStyles.companyInfo}>PT LUMBUNG TELUR INDONESIA</Text>
           <Text style={pdfStyles.address}>
-            Setra Duta Raya No.L3 No.7, Ciwaruga, Kec. Parongpong, Kabupaten
-            Bandung Barat, Jawa Barat 40514
+            SOHO Building Lt.3 (Paris Van Java), Jalan Karang Tinggal, Kel.
+            Cipedes, Kec. Sukajadi, Kota Bandung 40162
           </Text>
           <View style={pdfStyles.divider} />
         </View>

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { ChangeEventHandler, useMemo, 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';
@@ -20,6 +20,8 @@ import { Area } from '@/types/api/master-data/area';
 import { AreaApi } 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',
@@ -101,6 +103,9 @@ const RowOptionsMenu = ({
 };
 
 const AreasTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -109,14 +114,12 @@ const AreasTable = () => {
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
     initial: {
-      search: '',
+      search: searchValue,
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
     },
-    persist: true,
-    storeName: 'areas-table',
   });
 
   const [sorting, setSorting] = useState<SortingState>([]);
@@ -134,8 +137,17 @@ const AreasTable = () => {
   const [selectedArea, setSelectedArea] = useState<Area | undefined>(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('areas-table', pathname);
+  }, [pathname, setTableState]);
+
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const confirmationModalDeleteClickHandler = async () => {

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { ChangeEventHandler, useMemo, 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';
@@ -20,6 +20,8 @@ import { Bank } from '@/types/api/master-data/bank';
 import { BankApi } 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',
@@ -101,6 +103,9 @@ const RowOptionsMenu = ({
 };
 
 const BanksTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -109,14 +114,12 @@ const BanksTable = () => {
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
     initial: {
-      search: '',
+      search: searchValue,
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
     },
-    persist: true,
-    storeName: 'banks-table',
   });
 
   const [sorting, setSorting] = useState<SortingState>([]);
@@ -134,8 +137,17 @@ const BanksTable = () => {
   const [selectedBank, setSelectedBank] = useState<Bank | undefined>(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('banks-table', pathname);
+  }, [pathname, setTableState]);
+
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const confirmationModalDeleteClickHandler = async () => {

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { ChangeEventHandler, useMemo, 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';
@@ -20,6 +20,8 @@ import { Customer } from '@/types/api/master-data/customer';
 import { CustomerApi } 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',
@@ -101,6 +103,9 @@ const RowOptionsMenu = ({
 };
 
 const CustomersTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -109,14 +114,12 @@ const CustomersTable = () => {
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
     initial: {
-      search: '',
+      search: searchValue,
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
     },
-    persist: true,
-    storeName: 'customers-table',
   });
 
   const [sorting, setSorting] = useState<SortingState>([]);
@@ -136,8 +139,17 @@ const CustomersTable = () => {
   >(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('customers-table', pathname);
+  }, [pathname, setTableState]);
+
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const confirmationModalDeleteClickHandler = async () => {
@@ -189,11 +201,6 @@ const CustomersTable = () => {
         accessorKey: 'email',
         header: 'Email',
       },
-      {
-        accessorKey: 'bank_name',
-        header: 'Nama Bank',
-        cell: (props) => props.row.original.bank_name || '-',
-      },
       {
         header: 'Aksi',
         cell: (props: CellContext<Customer, unknown>) => {

src/components/pages/master-data/customer/form/CustomerForm.schema.ts

@@ -27,9 +27,6 @@ export const CustomerFormSchema = Yup.object({
     .email('Format email tidak valid!')
     .required('Email wajib diisi!'),
 
-  bank_name: Yup.string()
-    .min(3, 'Nama bank minimal 3 karakter!')
-    .required('Nama bank wajib diisi!'),
   account_number: Yup.string()
     .matches(/^[0-9]+$/, 'Nomor rekening hanya boleh berisi angka!')
     .required('Nomor rekening wajib diisi!'),

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

@@ -142,7 +142,6 @@ const CustomerForm = ({
           },
       type: normalizeType(initialValues?.type),
       address: initialValues?.address ?? '',
-      bank_name: initialValues?.bank_name ?? '',
       account_number: initialValues?.account_number ?? '',
     };
   }, [initialValues]);
@@ -165,7 +164,6 @@ const CustomerForm = ({
         pic_id: values.picId,
         type: (values.type as OptionType).value as string,
         address: values.address,
-        bank_name: values.bank_name,
         account_number: values.account_number,
       };
 
@@ -288,22 +286,6 @@ const CustomerForm = ({
               errorMessage={formik.errors.phone}
               readOnly={formType === 'detail'}
             />
-            <TextInput
-              required
-              label='Nama Bank'
-              name='bank_name'
-              placeholder='Masukkan nama bank customer'
-              value={formik.values.bank_name}
-              onChange={(e) =>
-                formik.setFieldValue('bank_name', e.target.value.toUpperCase())
-              }
-              onBlur={formik.handleBlur}
-              isError={
-                formik.touched.bank_name && Boolean(formik.errors.bank_name)
-              }
-              errorMessage={formik.errors.bank_name}
-              readOnly={formType === 'detail'}
-            />
             <TextInput
               required
               label='Nomor Rekening'

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { ChangeEventHandler, useMemo, 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';
@@ -20,6 +20,8 @@ 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',
@@ -101,6 +103,9 @@ const RowOptionsMenu = ({
 };
 
 const FlockTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -109,14 +114,12 @@ const FlockTable = () => {
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
     initial: {
-      search: '',
+      search: searchValue,
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
     },
-    persist: true,
-    storeName: 'flock-table',
   });
 
   const [sorting, setSorting] = useState<SortingState>([]);
@@ -136,8 +139,17 @@ const FlockTable = () => {
   );
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('flocks-table', pathname);
+  }, [pathname, setTableState]);
+
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const confirmationModalDeleteClickHandler = async () => {

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

@@ -1,6 +1,13 @@
 '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 { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 import toast from 'react-hot-toast';
@@ -28,6 +35,7 @@ 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 { useUiStore } from '@/stores/ui/ui.store';
 import {
   KandangFilterSchema,
   KandangFilterType,
@@ -114,21 +122,20 @@ const RowOptionsMenu = ({
 };
 
 const KandangsTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
     setPage,
     setPageSize,
     toQueryString: getTableFilterQueryString,
-  } = useTableFilter<{
-    search: string;
-    locationFilter?: OptionType<string>;
-    picFilter?: OptionType<string>;
-  }>({
+  } = useTableFilter({
     initial: {
       search: '',
-      locationFilter: undefined,
-      picFilter: undefined,
+      locationFilter: '',
+      picFilter: '',
     },
     paramMap: {
       page: 'page',
@@ -136,8 +143,6 @@ const KandangsTable = () => {
       locationFilter: 'location_id',
       picFilter: 'pic_id',
     },
-    persist: true,
-    storeName: 'kandangs-table',
   });
 
   // ===== FILTER MODAL STATE =====
@@ -146,34 +151,22 @@ const KandangsTable = () => {
   // ===== FORMIK SETUP =====
   const formik = useFormik<KandangFilterType>({
     initialValues: {
-      location: tableFilterState.locationFilter,
-      pic: tableFilterState.picFilter,
+      location_id: null,
+      pic_id: null,
     },
     validationSchema: KandangFilterSchema,
     onSubmit: (values, { setSubmitting }) => {
-      updateFilter('locationFilter', values.location || undefined, true);
-      updateFilter('picFilter', values.pic || undefined, true);
+      updateFilter('locationFilter', values.location_id || '');
+      updateFilter('picFilter', values.pic_id || '');
       filterModal.closeModal();
       setSubmitting(false);
     },
+    onReset: () => {
+      updateFilter('locationFilter', '');
+      updateFilter('picFilter', '');
+    },
   });
 
-  const formikResetHandler = () => {
-    updateFilter('locationFilter', undefined, true);
-    updateFilter('picFilter', undefined, true);
-
-    formik.resetForm({
-      values: {
-        location: undefined,
-        pic: undefined,
-      },
-    });
-
-    filterModal.closeModal();
-  };
-
-  const { setFieldValue } = formik;
-
   // ===== LOCATION OPTIONS =====
   const {
     setInputValue: setLocationInputValue,
@@ -201,15 +194,43 @@ const KandangsTable = () => {
   );
 
   // ===== FILTER HANDLERS =====
-  const handleFilterLocationChange = (
-    val: OptionType | OptionType[] | null
-  ) => {
-    setFieldValue('location', val);
-  };
+  const handleFilterLocationChange = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      const location = val as OptionType | null;
+      const locationId = location?.value ? String(location.value) : null;
 
-  const handleFilterPicChange = (val: OptionType | OptionType[] | null) => {
-    setFieldValue('pic', val);
-  };
+      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 = () => {
@@ -234,8 +255,17 @@ const KandangsTable = () => {
   );
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('kandangs-table', pathname);
+  }, [pathname, setTableState]);
+
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const confirmationModalDeleteClickHandler = async () => {
@@ -284,10 +314,6 @@ const KandangsTable = () => {
         accessorFn: (row) => row.pic?.name ?? '-',
         header: 'PIC',
       },
-      {
-        accessorFn: (row) => row.kandang_group?.name ?? '-',
-        header: 'Kandang Group',
-      },
       {
         header: 'Aksi',
         cell: (props: CellContext<Kandang, unknown>) => {
@@ -445,13 +471,13 @@ const KandangsTable = () => {
             <Icon icon='heroicons:x-mark' width={20} height={20} />
           </Button>
         </div>
-        <form onSubmit={formik.handleSubmit} onReset={formikResetHandler}>
+        <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={formik.values.location}
+              value={locationIdValue}
               onChange={handleFilterLocationChange}
               onInputChange={setLocationInputValue}
               isLoading={isLoadingLocationOptions}
@@ -464,7 +490,7 @@ const KandangsTable = () => {
               label='PIC'
               placeholder='Pilih PIC'
               options={picOptions}
-              value={formik.values.pic}
+              value={picIdValue}
               onChange={handleFilterPicChange}
               onInputChange={setPicInputValue}
               isLoading={isLoadingPicOptions}
@@ -480,14 +506,17 @@ const KandangsTable = () => {
               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={formikResetHandler}
+              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}
+              disabled={!formik.isValid || formik.isSubmitting}
             >
               Apply Filter
             </Button>

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

@@ -1,19 +1,11 @@
-import { OptionType } from '@/components/input/SelectInput';
-import * as Yup from 'yup';
+import { string, object } from 'yup';
 
-export const KandangFilterSchema = Yup.object().shape({
-  location: Yup.object({
-    value: Yup.string().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
-
-  pic: Yup.object({
-    value: Yup.string().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
+export const KandangFilterSchema = object().shape({
+  location_id: string().nullable(),
+  pic_id: string().nullable(),
 });
 
 export type KandangFilterType = {
-  location?: OptionType<string>;
-  pic?: OptionType<string>;
+  location_id: string | null;
+  pic_id: string | null;
 };

src/components/pages/master-data/kandang/form/KandangForm.schema.ts

@@ -1,4 +1,3 @@
-import { OptionType } from '@/components/input/SelectInput';
 import * as Yup from 'yup';
 
 type KandangFormSchemaType = {
@@ -20,7 +19,6 @@ type KandangFormSchemaType = {
       }
     | undefined
     | null;
-  group?: OptionType;
 };
 
 export const KandangFormSchema: Yup.ObjectSchema<KandangFormSchemaType> =
@@ -44,11 +42,6 @@ export const KandangFormSchema: Yup.ObjectSchema<KandangFormSchemaType> =
       value: Yup.number().min(1).required(),
       label: Yup.string().required(),
     }).nullable(),
-
-    group: Yup.object({
-      value: Yup.number().min(1).required('Kandang Grup wajib diisi!'),
-      label: Yup.string().required('Kandang Grup wajib diisi!'),
-    }).required('Kandang Grup wajib diisi!'),
   });
 
 export const UpdateKandangFormSchema = KandangFormSchema;

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

@@ -2,7 +2,7 @@
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useRouter } from 'next/navigation';
-import { getIn, useFormik } from 'formik';
+import { useFormik } from 'formik';
 import { toast } from 'react-hot-toast';
 
 import { Icon } from '@iconify/react';
@@ -34,8 +34,6 @@ import NumberInput from '@/components/input/NumberInput';
 import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 import AlertErrorList from '@/components/helper/form/FormErrors';
 import { User } from '@/types/api/api-general';
-import { DailyChecklistKandang } from '@/types/api/daily-checklist/kandang';
-import { DailyChecklistKandangApi } from '@/services/api/daily-checklist/kandang';
 
 interface KandangFormProps {
   type?: 'add' | 'edit' | 'detail';
@@ -98,12 +96,6 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
             label: initialValues.pic.name,
           }
         : null,
-      group: initialValues?.kandang_group
-        ? {
-            value: initialValues.kandang_group.id,
-            label: initialValues.kandang_group.name,
-          }
-        : undefined,
     };
   }, [initialValues]);
 
@@ -119,7 +111,6 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
         location_id: values.locationId!,
         capacity: values.capacity ? parseInt(values.capacity.toString()) : 0,
         pic_id: values.picId!,
-        group_id: values.group?.value as number,
       };
 
       switch (type) {
@@ -171,23 +162,6 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
     formik.setFieldValue('picId', (val as OptionType)?.value);
   };
 
-  // Kandang Group
-  const {
-    setInputValue: setKandangGroupSelectInputValue,
-    options: kandangGroupOptions,
-    isLoadingOptions: isLoadingKandangGroupOptions,
-    loadMore: loadMoreKandangGroups,
-  } = useSelect<DailyChecklistKandang>(
-    DailyChecklistKandangApi.basePath,
-    'id',
-    'name'
-  );
-
-  const kandangGroupChangeHandler = (val: OptionType | OptionType[] | null) => {
-    formik.setFieldTouched('group', true);
-    formik.setFieldValue('group', val);
-  };
-
   const deleteKandangClickHandler = () => {
     deleteModal.openModal();
   };
@@ -295,24 +269,6 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
               isDisabled={type === 'detail'}
               isClearable
             />
-
-            <SelectInput
-              required
-              label='Kandang Group'
-              value={formik.values.group ?? undefined}
-              onChange={kandangGroupChangeHandler}
-              options={kandangGroupOptions}
-              onInputChange={setKandangGroupSelectInputValue}
-              onMenuScrollToBottom={loadMoreKandangGroups}
-              isLoading={isLoadingKandangGroupOptions}
-              isError={formik.touched.group && Boolean(formik.errors.group)}
-              errorMessage={
-                getIn(formik.errors.group, 'value') ??
-                (formik.errors.group as string)
-              }
-              isDisabled={type === 'detail'}
-              isClearable
-            />
           </div>
 
           <div className='flex flex-row justify-between gap-2 flex-wrap'>

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

@@ -1,6 +1,13 @@
 '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 { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 import toast from 'react-hot-toast';
@@ -25,6 +32,7 @@ import { Area } from '@/types/api/master-data/area';
 import { LocationApi, AreaApi } 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 {
   LocationFilterSchema,
   LocationFilterType,
@@ -110,27 +118,25 @@ const RowOptionsMenu = ({
 };
 
 const LocationsTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
     setPage,
     setPageSize,
     toQueryString: getTableFilterQueryString,
-  } = useTableFilter<{
-    search: string;
-    areaFilter?: OptionType<string>;
-  }>({
+  } = useTableFilter({
     initial: {
       search: '',
-      areaFilter: undefined,
+      areaFilter: '',
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
       areaFilter: 'area_id',
     },
-    persist: true,
-    storeName: 'locations-table',
   });
 
   // ===== FILTER MODAL STATE =====
@@ -139,28 +145,19 @@ const LocationsTable = () => {
   // ===== FORMIK SETUP =====
   const formik = useFormik<LocationFilterType>({
     initialValues: {
-      area: tableFilterState.areaFilter,
+      area_id: null,
     },
     validationSchema: LocationFilterSchema,
     onSubmit: (values, { setSubmitting }) => {
-      updateFilter('areaFilter', values.area || undefined, true);
+      updateFilter('areaFilter', values.area_id || '');
       filterModal.closeModal();
       setSubmitting(false);
     },
+    onReset: () => {
+      updateFilter('areaFilter', '');
+    },
   });
 
-  const formikResetHandler = () => {
-    updateFilter('areaFilter', undefined, true);
-
-    formik.resetForm({
-      values: {
-        area: undefined,
-      },
-    });
-
-    filterModal.closeModal();
-  };
-
   // ===== AREA OPTIONS =====
   const {
     setInputValue: setAreaInputValue,
@@ -175,9 +172,24 @@ const LocationsTable = () => {
   );
 
   // ===== FILTER HANDLERS =====
-  const handleFilterAreaChange = (val: OptionType | OptionType[] | null) => {
-    formik.setFieldValue('area', val);
-  };
+  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 = () => {
@@ -200,10 +212,19 @@ const LocationsTable = () => {
   >(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 searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const confirmationModalDeleteClickHandler = async () => {
@@ -404,13 +425,13 @@ const LocationsTable = () => {
             <Icon icon='heroicons:x-mark' width={20} height={20} />
           </Button>
         </div>
-        <form onSubmit={formik.handleSubmit} onReset={formikResetHandler}>
+        <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={formik.values.area}
+              value={areaIdValue}
               onChange={handleFilterAreaChange}
               onInputChange={setAreaInputValue}
               isLoading={isLoadingAreaOptions}
@@ -426,7 +447,10 @@ const LocationsTable = () => {
               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={formikResetHandler}
+              onClick={() => {
+                formik.resetForm();
+                filterModal.closeModal();
+              }}
             >
               Reset Filter
             </Button>

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

@@ -1,13 +1,9 @@
-import { OptionType } from '@/components/input/SelectInput';
-import * as Yup from 'yup';
+import { string, object } from 'yup';
 
-export const LocationFilterSchema = Yup.object().shape({
-  area: Yup.object({
-    value: Yup.string().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
+export const LocationFilterSchema = object().shape({
+  area_id: string().nullable(),
 });
 
 export type LocationFilterType = {
-  area?: OptionType<string>;
+  area_id: string | null;
 };

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

@@ -20,6 +20,8 @@ import { Nonstock } from '@/types/api/master-data/nonstock';
 import { NonstockApi } 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',
@@ -101,6 +103,9 @@ const RowOptionsMenu = ({
 };
 
 const NonstocksTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -109,16 +114,22 @@ const NonstocksTable = () => {
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
     initial: {
-      search: '',
+      search: searchValue,
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
     },
-    persist: true,
-    storeName: 'nonstock-table',
   });
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('nonstocks-table', pathname);
+  }, [pathname, setTableState]);
+
   const [sorting, setSorting] = useState<SortingState>([]);
 
   const {
@@ -137,7 +148,8 @@ const NonstocksTable = () => {
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const confirmationModalDeleteClickHandler = async () => {

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

@@ -1,6 +1,7 @@
 'use client';
 
-import { ChangeEventHandler, useMemo, 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';
@@ -20,6 +21,7 @@ import { ProductCategory } from '@/types/api/master-data/product-category';
 import { ProductCategoryApi } 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';
 
 const RowOptionsMenu = ({
   popoverPosition = 'bottom',
@@ -101,6 +103,9 @@ const RowOptionsMenu = ({
 };
 
 const ProductCategoryTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -115,10 +120,12 @@ const ProductCategoryTable = () => {
       page: 'page',
       pageSize: 'limit',
     },
-    persist: true,
-    storeName: 'product-category-table',
   });
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
   const [sorting, setSorting] = useState<SortingState>([]);
 
   const {
@@ -137,7 +144,8 @@ const ProductCategoryTable = () => {
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const confirmationModalDeleteClickHandler = async () => {
@@ -206,6 +214,10 @@ const ProductCategoryTable = () => {
     [tableFilterState.pageSize, tableFilterState.page, deleteModal]
   );
 
+  useEffect(() => {
+    setTableState('product-category-table', pathname);
+  }, [pathname, setTableState]);
+
   return (
     <>
       <div className='w-full'>

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

@@ -1,6 +1,13 @@
 '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 { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 import toast from 'react-hot-toast';
@@ -26,6 +33,7 @@ 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 { useUiStore } from '@/stores/ui/ui.store';
 import {
   ProductFilterSchema,
   ProductFilterType,
@@ -111,27 +119,25 @@ const RowOptionsMenu = ({
 };
 
 const ProductsTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
     setPage,
     setPageSize,
     toQueryString: getTableFilterQueryString,
-  } = useTableFilter<{
-    search: string;
-    productCategoryFilter?: OptionType<string>;
-  }>({
+  } = useTableFilter({
     initial: {
       search: '',
-      productCategoryFilter: undefined,
+      productCategoryFilter: '',
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
       productCategoryFilter: 'product_category_id',
     },
-    persist: true,
-    storeName: 'product-table',
   });
 
   // ===== FILTER MODAL STATE =====
@@ -140,32 +146,19 @@ const ProductsTable = () => {
   // ===== FORMIK SETUP =====
   const formik = useFormik<ProductFilterType>({
     initialValues: {
-      product_category: tableFilterState.productCategoryFilter,
+      product_category_id: null,
     },
     validationSchema: ProductFilterSchema,
     onSubmit: (values, { setSubmitting }) => {
-      updateFilter(
-        'productCategoryFilter',
-        values.product_category || undefined,
-        true
-      );
+      updateFilter('productCategoryFilter', values.product_category_id || '');
       filterModal.closeModal();
       setSubmitting(false);
     },
+    onReset: () => {
+      updateFilter('productCategoryFilter', '');
+    },
   });
 
-  const formikResetHandler = () => {
-    updateFilter('productCategoryFilter', undefined, true);
-
-    formik.resetForm({
-      values: {
-        product_category: undefined,
-      },
-    });
-
-    filterModal.closeModal();
-  };
-
   // ===== PRODUCT CATEGORY OPTIONS =====
   const {
     setInputValue: setProductCategoryInputValue,
@@ -180,11 +173,25 @@ const ProductsTable = () => {
   );
 
   // ===== FILTER HANDLERS =====
-  const handleFilterProductCategoryChange = (
-    val: OptionType | OptionType[] | null
-  ) => {
-    formik.setFieldValue('product_category', val);
-  };
+  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 = () => {
@@ -192,6 +199,10 @@ const ProductsTable = () => {
     formik.validateForm();
   };
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
   const [sorting, setSorting] = useState<SortingState>([]);
 
   const {
@@ -209,8 +220,13 @@ const ProductsTable = () => {
   );
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
+  useEffect(() => {
+    setTableState('product-table', pathname);
+  }, [pathname, setTableState]);
+
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const confirmationModalDeleteClickHandler = async () => {
@@ -461,13 +477,13 @@ const ProductsTable = () => {
             <Icon icon='heroicons:x-mark' width={20} height={20} />
           </Button>
         </div>
-        <form onSubmit={formik.handleSubmit} onReset={formikResetHandler}>
+        <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={formik.values.product_category}
+              value={productCategoryIdValue}
               onChange={handleFilterProductCategoryChange}
               onInputChange={setProductCategoryInputValue}
               isLoading={isLoadingProductCategoryOptions}
@@ -483,7 +499,10 @@ const ProductsTable = () => {
               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={formikResetHandler}
+              onClick={() => {
+                formik.resetForm();
+                filterModal.closeModal();
+              }}
             >
               Reset Filter
             </Button>

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

@@ -1,13 +1,9 @@
-import { OptionType } from '@/components/input/SelectInput';
-import * as Yup from 'yup';
+import { string, object } from 'yup';
 
-export const ProductFilterSchema = Yup.object().shape({
-  product_category: Yup.object({
-    value: Yup.string().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
+export const ProductFilterSchema = object().shape({
+  product_category_id: string().nullable(),
 });
 
 export type ProductFilterType = {
-  product_category?: OptionType<string>;
+  product_category_id: string | null;
 };

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

@@ -154,17 +154,17 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
         sku: values.sku,
         uom_id: values.uom_id,
         product_category_id: values.product_category_id,
-        product_price: parseFloat(values.product_price.toString()) || 0,
+        product_price: parseInt(values.product_price.toString()) || 0,
         selling_price: values.selling_price
-          ? parseFloat(values.selling_price.toString()) || 0
+          ? parseInt(values.selling_price.toString()) || 0
           : undefined,
-        tax: values.tax ? parseFloat(values.tax.toString()) || 0 : undefined,
+        tax: values.tax ? parseInt(values.tax.toString()) || 0 : undefined,
         expiry_period: values.expiry_period
-          ? parseFloat(values.expiry_period.toString()) || 0
+          ? parseInt(values.expiry_period.toString()) || 0
           : undefined,
         suppliers: values.suppliers.map((s) => ({
           supplier_id: s.supplier?.value as number,
-          price: parseFloat(s.price.toString()) || 0,
+          price: parseInt(s.price.toString()) || 0,
         })),
         flag: values.flag,
         sub_flags: values.sub_flags,

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

@@ -128,44 +128,27 @@ const ProductionStandardTable = () => {
       pageSize: 'limit',
       projectCategoryFilter: 'project_category',
     },
-    persist: true,
-    storeName: 'production-standard-table',
   });
 
   // ===== FILTER MODAL STATE =====
   const filterModal = useModal();
 
-  // ===== FILTER INITIAL VALUES (derived from persisted state) =====
-  const filterInitialValues = useMemo<ProductionStandardFilterType>(
-    () => ({
-      project_category: tableFilterState.projectCategoryFilter || null,
-    }),
-    [tableFilterState.projectCategoryFilter]
-  );
-
   // ===== FORMIK SETUP =====
   const formik = useFormik<ProductionStandardFilterType>({
-    initialValues: filterInitialValues,
+    initialValues: {
+      project_category: null,
+    },
     validationSchema: ProductionStandardFilterSchema,
     onSubmit: (values, { setSubmitting }) => {
       updateFilter('projectCategoryFilter', values.project_category || '');
       filterModal.closeModal();
       setSubmitting(false);
     },
+    onReset: () => {
+      updateFilter('projectCategoryFilter', '');
+    },
   });
 
-  const formikResetHandler = () => {
-    updateFilter('projectCategoryFilter', '', true);
-
-    formik.resetForm({
-      values: {
-        project_category: null,
-      },
-    });
-
-    filterModal.closeModal();
-  };
-
   // ===== PROJECT CATEGORY OPTIONS (GROWING or LAYING) =====
   const projectCategoryOptions = useMemo(
     () => [
@@ -398,7 +381,7 @@ const ProductionStandardTable = () => {
             <Icon icon='heroicons:x-mark' width={20} height={20} />
           </Button>
         </div>
-        <form onSubmit={formik.handleSubmit} onReset={formikResetHandler}>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
           <div className='p-4 flex flex-col gap-1.5'>
             <SelectInputRadio
               label='Kategori'
@@ -414,9 +397,13 @@ const ProductionStandardTable = () => {
           {/* 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'
+              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>

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

@@ -7,6 +7,7 @@ import {
   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';
@@ -29,7 +30,7 @@ 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,
@@ -116,21 +117,20 @@ const RowOptionsMenu = ({
 };
 
 const SuppliersTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
     setPage,
     setPageSize,
     toQueryString: getTableFilterQueryString,
-  } = useTableFilter<{
-    search: string;
-    categoryFilter?: OptionType<string>;
-    flagFilter?: string;
-  }>({
+  } = useTableFilter({
     initial: {
       search: '',
-      categoryFilter: undefined,
-      flagFilter: undefined,
+      categoryFilter: '',
+      flagFilter: '',
     },
     paramMap: {
       page: 'page',
@@ -138,8 +138,6 @@ const SuppliersTable = () => {
       categoryFilter: 'category_id',
       flagFilter: 'flag',
     },
-    persist: true,
-    storeName: 'supplier-table',
   });
 
   // ===== FILTER MODAL STATE =====
@@ -148,33 +146,26 @@ const SuppliersTable = () => {
   // ===== FORMIK SETUP =====
   const formik = useFormik<SupplierFilterType>({
     initialValues: {
-      category: tableFilterState.categoryFilter,
-      flag: tableFilterState.flagFilter === 'EKSPEDISI',
+      category_id: null,
+      flag: false,
     },
     validationSchema: SupplierFilterSchema,
     onSubmit: (values, { setSubmitting }) => {
-      updateFilter('categoryFilter', values.category || undefined, true);
-      updateFilter('flagFilter', values.flag === true ? 'EKSPEDISI' : '', true);
+      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 formikResetHandler = () => {
-    updateFilter('categoryFilter', undefined, true);
-    updateFilter('flagFilter', '', true);
-
-    formik.resetForm({
-      values: {
-        category: undefined,
-        flag: false,
-      },
-    });
-
-    filterModal.closeModal();
-  };
-
   const { setFieldValue } = formik;
 
   // ===== CATEGORY OPTIONS (SAPRONAK or BOP) =====
@@ -196,11 +187,15 @@ const SuppliersTable = () => {
   );
 
   // ===== FILTER HANDLERS =====
-  const handleFilterCategoryChange = (
-    val: OptionType | OptionType[] | null
-  ) => {
-    setFieldValue('category', val);
-  };
+  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) => {
@@ -218,13 +213,13 @@ const SuppliersTable = () => {
   );
 
   // ===== 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 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;
@@ -248,6 +243,14 @@ const SuppliersTable = () => {
     }
   }, [filterModal.open, tableFilterState.flagFilter, setFieldValue]);
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('suppliers-table', pathname);
+  }, [pathname, setTableState]);
+
   const [sorting, setSorting] = useState<SortingState>([]);
 
   const {
@@ -266,7 +269,8 @@ const SuppliersTable = () => {
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const confirmationModalDeleteClickHandler = async () => {
@@ -326,11 +330,6 @@ const SuppliersTable = () => {
         accessorKey: 'email',
         header: 'Email',
       },
-      {
-        accessorKey: 'bank_name',
-        header: 'Nama Bank',
-        cell: (props) => props.row.original.bank_name || '-',
-      },
       {
         accessorKey: 'address',
         header: 'Alamat',
@@ -492,13 +491,13 @@ const SuppliersTable = () => {
             <Icon icon='heroicons:x-mark' width={20} height={20} />
           </Button>
         </div>
-        <form onSubmit={formik.handleSubmit} onReset={formikResetHandler}>
+        <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={formik.values.category}
+              value={categoryIdValue}
               onChange={handleFilterCategoryChange}
               isClearable
               className={{ wrapper: 'w-full' }}
@@ -518,9 +517,13 @@ const SuppliersTable = () => {
           {/* 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'
+              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>

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

@@ -1,16 +1,11 @@
-import { OptionType } from '@/components/input/SelectInput';
-import * as Yup from 'yup';
+import { string, boolean, object } from 'yup';
 
-export const SupplierFilterSchema = Yup.object().shape({
-  category: Yup.object({
-    value: Yup.string().required(),
-    label: Yup.string().required(),
-  }).nullable(),
-
-  flag: Yup.boolean().nullable(),
+export const SupplierFilterSchema = object().shape({
+  category_id: string().nullable(),
+  flag: boolean().nullable(),
 });
 
 export type SupplierFilterType = {
-  category?: OptionType<string>;
+  category_id: string | null;
   flag: boolean | null;
 };

src/components/pages/master-data/supplier/form/SupplierForm.schema.ts

@@ -31,9 +31,6 @@ export const SupplierFormSchema = Yup.object({
   npwp: Yup.string()
     .matches(/^[0-9]+$/, 'Nomor NPWP hanya boleh berisi angka!')
     .required('Nomor NPWP wajib diisi!'),
-  bank_name: Yup.string()
-    .min(3, 'Nama bank minimal 3 karakter!')
-    .required('Nama bank wajib diisi!'),
   account_number: Yup.string()
     .matches(/^[0-9]+$/, 'Nomor rekening hanya boleh berisi angka!')
     .required('Nomor rekening wajib diisi!'),

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

@@ -122,7 +122,6 @@ const SupplierForm = ({
       email: initialValues?.email ?? '',
       address: initialValues?.address ?? '',
       npwp: initialValues?.npwp ?? '',
-      bank_name: initialValues?.bank_name ?? '',
       account_number: initialValues?.account_number ?? '',
       due_date: initialValues?.due_date ?? 1,
     };
@@ -150,7 +149,6 @@ const SupplierForm = ({
         email: values.email,
         address: values.address,
         npwp: values.npwp,
-        bank_name: values.bank_name,
         account_number: values.account_number,
         due_date: parseInt(values.due_date.toString()),
       };
@@ -370,22 +368,6 @@ const SupplierForm = ({
               errorMessage={formik.errors.npwp}
               readOnly={formType === 'detail'}
             />
-            <TextInput
-              required
-              label='Nama Bank'
-              name='bank_name'
-              placeholder='Masukkan nama bank supplier'
-              value={formik.values.bank_name}
-              onChange={(e) =>
-                formik.setFieldValue('bank_name', e.target.value.toUpperCase())
-              }
-              onBlur={formik.handleBlur}
-              isError={
-                formik.touched.bank_name && Boolean(formik.errors.bank_name)
-              }
-              errorMessage={formik.errors.bank_name}
-              readOnly={formType === 'detail'}
-            />
             <TextInput
               required
               label='Nomor Rekening'

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { ChangeEventHandler, useMemo, 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';
@@ -20,6 +20,8 @@ import { Uom } from '@/types/api/master-data/uom';
 import { UomApi } 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',
@@ -101,6 +103,9 @@ const RowOptionsMenu = ({
 };
 
 const UomsTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -109,16 +114,22 @@ const UomsTable = () => {
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
     initial: {
-      search: '',
+      search: searchValue,
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
     },
-    persist: true,
-    storeName: 'uom-table',
   });
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('uoms-table', pathname);
+  }, [pathname, setTableState]);
+
   const [sorting, setSorting] = useState<SortingState>([]);
 
   const {
@@ -135,7 +146,8 @@ const UomsTable = () => {
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const confirmationModalDeleteClickHandler = async () => {

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

@@ -1,6 +1,13 @@
 'use client';
 
-import { ChangeEventHandler, useCallback, useMemo, useState } from 'react';
+import {
+  ChangeEventHandler,
+  useCallback,
+  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';
@@ -24,6 +31,7 @@ import { Warehouse } from '@/types/api/master-data/warehouse';
 import { WarehouseApi, AreaApi } 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 {
   WarehouseFilterSchema,
   WarehouseFilterType,
@@ -112,6 +120,9 @@ const RowOptionsMenu = ({
 };
 
 const WarehousesTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -130,8 +141,6 @@ const WarehousesTable = () => {
       areaFilter: 'area_id',
       activeProjectFlockFilter: 'active_project_flock',
     },
-    persist: true,
-    storeName: 'warehouses-table',
   });
 
   // ===== FILTER MODAL STATE =====
@@ -140,36 +149,27 @@ const WarehousesTable = () => {
   // ===== FORMIK SETUP =====
   const formik = useFormik<WarehouseFilterType>({
     initialValues: {
-      area_id: tableFilterState.areaFilter || null,
-      active_project_flock:
-        tableFilterState.activeProjectFlockFilter === 'true',
+      area_id: null,
+      active_project_flock: false,
     },
     validationSchema: WarehouseFilterSchema,
     onSubmit: (values, { setSubmitting }) => {
-      updateFilter('areaFilter', values.area_id || '', true);
+      updateFilter('areaFilter', values.area_id || '');
       updateFilter(
         'activeProjectFlockFilter',
-        values.active_project_flock === true ? 'true' : '',
-        true
+        values.active_project_flock === true ? 'true' : ''
       );
       filterModal.closeModal();
       setSubmitting(false);
     },
+    onReset: () => {
+      updateFilter('areaFilter', '');
+      updateFilter('activeProjectFlockFilter', '');
+      formik.setFieldValue('active_project_flock', false);
+    },
   });
 
-  const formikResetHandler = () => {
-    updateFilter('areaFilter', '', true);
-    updateFilter('activeProjectFlockFilter', '', true);
-
-    formik.resetForm({
-      values: {
-        area_id: null,
-        active_project_flock: false,
-      },
-    });
-
-    filterModal.closeModal();
-  };
+  const { setFieldValue } = formik;
 
   // ===== AREA OPTIONS =====
   const {
@@ -243,6 +243,26 @@ const WarehousesTable = () => {
     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 {
@@ -261,7 +281,8 @@ const WarehousesTable = () => {
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
 
   const confirmationModalDeleteClickHandler = async () => {
@@ -486,7 +507,7 @@ const WarehousesTable = () => {
             <Icon icon='heroicons:x-mark' width={20} height={20} />
           </Button>
         </div>
-        <form onSubmit={formik.handleSubmit} onReset={formikResetHandler}>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
           <div className='p-4 flex flex-col gap-1.5'>
             <SelectInput
               label='Area'
@@ -517,7 +538,10 @@ const WarehousesTable = () => {
               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={formikResetHandler}
+              onClick={() => {
+                formik.resetForm();
+                filterModal.closeModal();
+              }}
             >
               Reset Filter
             </Button>

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

@@ -44,7 +44,9 @@ const ChickinFormKandang = ({
 
   const afterSubmitFormChickin = () => {
     setOpenChickin(true);
-    afterSubmit && afterSubmit();
+    if (afterSubmit) {
+      afterSubmit();
+    }
     refreshApprovals();
   };
 

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

@@ -23,7 +23,7 @@ const ChickinLogsView = ({
   rawDataApprovals: BaseApproval[];
 }) => {
   const [chickinErrorMessage, setChickinErrorMessage] = useState('');
-  const { openChickinApproveModal, openChickinDeleteModal } = useChickinStore();
+  const { openChickinApproveModal } = useChickinStore();
 
   const handleClickApprove = () => {
     openChickinApproveModal(initialValues, async (notes?: string) => {
@@ -40,21 +40,8 @@ const ChickinLogsView = ({
         toast.error(approveChickinRes?.message as string);
         setChickinErrorMessage(approveChickinRes?.message as string);
       }
-      afterSubmit && afterSubmit();
-    });
-  };
-
-  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');
+      if (afterSubmit) {
+        afterSubmit();
       }
     });
   };
@@ -101,30 +88,14 @@ 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' : '-'
-                        }
-                        color={
-                          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>
+                    <PillBadge
+                      content={
+                        isApproved ? 'Disetujui' : isPending ? 'Pending' : '-'
+                      }
+                      color={
+                        isApproved ? 'green' : isPending ? 'yellow' : 'gray'
+                      }
+                    />
                   </div>
 
                   {/* Tanggal Chick In */}

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

@@ -11,6 +11,7 @@ import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
 import Table from '@/components/Table';
+import Dropdown from '@/components/Dropdown';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { cn, formatDate } from '@/lib/helper';
 import { AreaApi, KandangApi, LocationApi } from '@/services/api/master-data';
@@ -22,6 +23,7 @@ import { Icon } from '@iconify/react';
 import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 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';
@@ -43,7 +45,6 @@ import {
 import Modal from '@/components/Modal';
 import SelectInputRadio from '@/components/input/SelectInputRadio';
 import ButtonFilter from '@/components/helper/ButtonFilter';
-import NumberInput from '@/components/input/NumberInput';
 
 const RowOptionsMenu = ({
   props,
@@ -58,7 +59,8 @@ const RowOptionsMenu = ({
   detailClickHandler: (id: number) => void;
   deleteClickHandler: () => void;
 }) => {
-  const showEditButton = props.row.original.approval?.step_number !== 2;
+  // TODO: change this to real condition
+  const showEditButton = true;
 
   const showDeleteButton = showEditButton;
 
@@ -147,6 +149,7 @@ const RowOptionsMenu = ({
 };
 
 const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
   const pathname = usePathname();
 
   const isSuccess = useProjectFlockStore((s) => s.isSuccess);
@@ -172,9 +175,6 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
       kandang_id: '',
       category: '',
       period: '',
-      area_name: '',
-      location_name: '',
-      kandang_name: '',
     },
     paramMap: {
       page: 'page',
@@ -186,11 +186,7 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
       category: 'category',
       period: 'period',
     },
-    excludeKeysFromUrl: ['area_name', 'location_name', 'kandang_name'],
-    persist: true,
-    storeName: 'project-flock-table',
   });
-
   const router = useRouter();
 
   // ===== State =====
@@ -204,25 +200,20 @@ 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'
   );
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
   const [isApproveLoading, setIsApproveLoading] = useState(false);
-
+  const [isLoadingExportingToExcel, setIsLoadingExportingToExcel] =
+    useState(false);
   const {
     isChickinApproveModalOpen,
     isChickinApproveLoading,
     chickinApproveCallback,
     closeChickinApproveModal,
     setChickinApproveLoading,
-    isChickinDeleteModalOpen,
-    isChickinDeleteLoading,
-    chickinDeleteCallback,
-    closeChickinDeleteModal,
-    setChickinDeleteLoading,
   } = useChickinStore();
 
   const {
@@ -261,18 +252,6 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
       updateFilter('kandang_id', values.kandang_id || '');
       updateFilter('category', values.category || '');
       updateFilter('period', values.period || '');
-      updateFilter(
-        'area_name',
-        areaValue?.label ? String(areaValue.label) : ''
-      );
-      updateFilter(
-        'location_name',
-        locationValue?.label ? String(locationValue.label) : ''
-      );
-      updateFilter(
-        'kandang_name',
-        kandangValue?.label ? String(kandangValue.label) : ''
-      );
       filterModal.closeModal();
       setSubmitting(false);
     },
@@ -282,9 +261,6 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
       updateFilter('kandang_id', '');
       updateFilter('category', '');
       updateFilter('period', '');
-      updateFilter('area_name', '');
-      updateFilter('location_name', '');
-      updateFilter('kandang_name', '');
       setFilterAreaId(undefined);
       setFilterLocationId(undefined);
       filterModal.closeModal();
@@ -326,55 +302,40 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
     []
   );
 
+  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;
-    const found = areaOptions.find(
-      (opt) => String(opt.value) === formik.values.area_id
+    return (
+      areaOptions.find((opt) => String(opt.value) === formik.values.area_id) ||
+      null
     );
-    if (found) return found;
-    if (tableFilterState.area_name) {
-      return {
-        value: formik.values.area_id,
-        label: tableFilterState.area_name,
-      };
-    }
-    return null;
-  }, [formik.values.area_id, areaOptions, tableFilterState.area_name]);
+  }, [formik.values.area_id, areaOptions]);
 
   const locationValue = useMemo(() => {
     if (!formik.values.location_id) return null;
-    const found = locationOptions.find(
-      (opt) => String(opt.value) === formik.values.location_id
+    return (
+      locationOptions.find(
+        (opt) => String(opt.value) === formik.values.location_id
+      ) || null
     );
-    if (found) return found;
-    if (tableFilterState.location_name) {
-      return {
-        value: formik.values.location_id,
-        label: tableFilterState.location_name,
-      };
-    }
-    return null;
-  }, [
-    formik.values.location_id,
-    locationOptions,
-    tableFilterState.location_name,
-  ]);
+  }, [formik.values.location_id, locationOptions]);
 
   const kandangValue = useMemo(() => {
     if (!formik.values.kandang_id) return null;
-    const found = kandangOptions.find(
-      (opt) => String(opt.value) === formik.values.kandang_id
+    return (
+      kandangOptions.find(
+        (opt) => String(opt.value) === formik.values.kandang_id
+      ) || null
     );
-    if (found) return found;
-    if (tableFilterState.kandang_name) {
-      return {
-        value: formik.values.kandang_id,
-        label: tableFilterState.kandang_name,
-      };
-    }
-    return null;
-  }, [formik.values.kandang_id, kandangOptions, tableFilterState.kandang_name]);
+  }, [formik.values.kandang_id, kandangOptions]);
 
   const categoryValue = useMemo(() => {
     if (!formik.values.category) return null;
@@ -384,6 +345,13 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
     );
   }, [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;
@@ -452,11 +420,18 @@ 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) => {
-    updateFilter('search', e.target.value, true);
+    setSearchValue(e.target.value);
+    updateFilter('search', e.target.value);
   };
-
   const confirmApprovalHandler = async (
     notes: string,
     approvalAction: 'APPROVED' | 'REJECTED'
@@ -503,14 +478,6 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
     }
   }, [isChickinApproveModalOpen, chickinApproveModal]);
 
-  useEffect(() => {
-    if (isChickinDeleteModalOpen) {
-      chickinDeleteModal.openModal();
-    } else {
-      chickinDeleteModal.closeModal();
-    }
-  }, [isChickinDeleteModalOpen, chickinDeleteModal]);
-
   useEffect(() => {
     if (isClosingModalOpen) {
       closingModal.openModal();
@@ -574,7 +541,6 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
           price: budget.price,
           total_price: budget.qty * budget.price,
         })) || [],
-      periode: createdProjectFlock.period ?? '-',
     } as ProjectFlockFormValues;
   }, [createdProjectFlock]);
 
@@ -797,6 +763,14 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
     []
   );
 
+  const exportToExcelHandler = async () => {
+    setIsLoadingExportingToExcel(true);
+
+    toast.error('Not implemented yet!');
+
+    setIsLoadingExportingToExcel(false);
+  };
+
   const bulkApproveClickHandler = () => {
     setApprovalAction('APPROVED');
     confirmModal.openModal();
@@ -985,17 +959,55 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
 
               <ButtonFilter
                 values={tableFilterState}
-                excludeFields={[
-                  'page',
-                  'pageSize',
-                  'search',
-                  'area_name',
-                  'location_name',
-                  'kandang_name',
-                ]}
+                excludeFields={['page', 'pageSize', 'search']}
                 onClick={handleFilterModalOpen}
                 className='px-3 py-2.5'
               />
+
+              <Dropdown
+                align='end'
+                direction='bottom'
+                className={{
+                  content:
+                    'mt-1 rounded-xl border border-base-content/5 shadow-sm overflow-hidden',
+                }}
+                trigger={
+                  <Button
+                    variant='outline'
+                    color='none'
+                    className='px-3 py-2.5 text-sm text-base-content/50 border border-base-content/10 rounded-xl shadow-button-soft'
+                  >
+                    <div className='flex flex-row items-center gap-1.5'>
+                      <Icon
+                        icon='heroicons:cloud-arrow-down'
+                        width={20}
+                        height={20}
+                      />
+
+                      <span>Export</span>
+
+                      <div className='w-px self-stretch bg-base-content/10' />
+
+                      <Icon
+                        icon='heroicons:chevron-down'
+                        width={14}
+                        height={14}
+                      />
+                    </div>
+                  </Button>
+                }
+              >
+                <Button
+                  variant='ghost'
+                  color='none'
+                  onClick={exportToExcelHandler}
+                  isLoading={isLoadingExportingToExcel}
+                  className='w-full p-3 justify-start text-sm text-base-content/50 font-semibold text-nowrap'
+                >
+                  <Icon icon='heroicons:table-cells' width={20} height={20} />
+                  Export to Excel
+                </Button>
+              </Dropdown>
             </div>
           </div>
 
@@ -1196,38 +1208,6 @@ 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}
@@ -1324,14 +1304,18 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
               isClearable={true}
             />
 
-            <NumberInput
+            <SelectInputRadio
               label='Periode'
-              name='period'
-              placeholder='Masukkan Periode'
-              value={formik.values.period ?? ''}
-              onChange={formik.handleChange}
-              onBlur={formik.handleBlur}
+              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>
 

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

@@ -26,7 +26,6 @@ type ProjectFlockFormSchemaType = {
     label: string;
   } | null;
   location_id: number;
-  periode: number | string;
   kandang_ids: number[];
   project_budgets: ProjectFlockBudgetsSchemaType[];
 };
@@ -110,12 +109,6 @@ export const ProjectFlockFormSchema: Yup.ObjectSchema<ProjectFlockFormSchemaType
       .min(1, 'Lokasi wajib diisi!')
       .required('Lokasi wajib diisi!'),
 
-    // Period
-    periode: Yup.number()
-      .typeError('Periode harus berupa angka!')
-      .min(1, 'Periode minimal 1!')
-      .required('Periode wajib diisi!'),
-
     kandang_ids: Yup.array()
       .of(Yup.number().required('Kandang tidak valid!'))
       .min(1, 'Minimal harus ada 1 kandang!')

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

@@ -152,10 +152,6 @@ export const ProjectFlockFormConfirmationTable = ({
       label: 'Standar Produksi',
       value: projectFlockForm?.production_standard?.label ?? '-',
     },
-    {
-      label: 'Periode',
-      value: projectFlockForm?.periode ?? '-',
-    },
     {
       label: 'Informasi Kandang',
       value: '',
@@ -265,7 +261,7 @@ const ProjectFlockForm = ({
     isLoadingOptions: isLoadingFlocks,
     options: optionsFlock,
     loadMore: loadMoreFlock,
-  } = useSelect(FlockApi.basePath, 'id', 'name', 'search', {
+  } = useSelect(FlockApi.basePath, 'id', 'name', '', {
     project_category: selectedCategory,
     location_id: selectedLocation,
     area_id: selectedArea,
@@ -283,7 +279,7 @@ const ProjectFlockForm = ({
     isLoadingOptions: isLoadingLocations,
     setInputValue: setInputValueLocation,
     loadMore: loadMoreLocation,
-  } = useSelect(LocationApi.basePath, 'id', 'name', 'search', {
+  } = useSelect(LocationApi.basePath, 'id', 'name', '', {
     area_id:
       selectedArea != ''
         ? selectedArea
@@ -295,7 +291,7 @@ const ProjectFlockForm = ({
     isLoadingOptions: isLoadingProductionStandards,
     setInputValue: setInputValueProductionStandard,
     loadMore: loadMoreProductionStandard,
-  } = useSelect(ProductionStandardApi.basePath, 'id', 'name', 'search', {
+  } = useSelect(ProductionStandardApi.basePath, 'id', 'name', '', {
     project_category: selectedCategory,
   });
 
@@ -311,7 +307,7 @@ const ProjectFlockForm = ({
   } = useSWR(kandangUrl, KandangApi.getAllFetcher);
 
   const { data: periodFlocks, mutate: refreshPeriodFlocks } = useSWR(
-    selectedFlock ? `${selectedFlock?.toString()}/periods` : undefined,
+    `${selectedFlock?.toString()}/periods`,
     () => ProjectFlockApi.getNextPeriod(parseInt(selectedLocation as string))
   );
 
@@ -533,7 +529,6 @@ const ProjectFlockForm = ({
       kandang_ids: initialValues?.kandangs?.map(
         (k: Kandang) => k.id
       ) as number[],
-      periode: initialValues?.period ?? '',
       project_budgets: initialValues?.project_budgets?.map((budget) => {
         return {
           nonstock: {
@@ -573,7 +568,6 @@ const ProjectFlockForm = ({
         category: values.category as string,
         production_standard_id: values.production_standard_id as number,
         location_id: values.location_id as number,
-        periode: parseInt(values.periode as unknown as string),
         kandang_ids: values.kandang_ids as number[],
         project_budgets: values.project_budgets.flatMap((budget) => {
           return {
@@ -799,7 +793,6 @@ const ProjectFlockForm = ({
         formik.values.kandang_ids?.includes(kandang.id)
       )?.period
     : undefined;
-
   const inputPeriod =
     (initialValues?.period ?? selectedPeriod == 0) ? 1 : selectedPeriod;
 
@@ -1029,18 +1022,12 @@ const ProjectFlockForm = ({
                   isDisabled={formType != 'add'}
                 />
                 <NumberInput
-                  name='periode'
+                  name='period'
                   label='Periode'
+                  disabled
+                  readOnly
                   placeholder='Periode Flock'
-                  value={formik.values.periode}
-                  onChange={formik.handleChange}
-                  onBlur={formik.handleBlur}
-                  allowNegative={false}
-                  decimalScale={0}
-                  isError={
-                    formik.touched.periode && Boolean(formik.errors.periode)
-                  }
-                  errorMessage={formik.errors.periode as string}
+                  value={selectedLocation ? inputPeriod : ''}
                 />
               </div>
 

src/components/pages/production/recording/filter/RecordingFilter.ts

@@ -1,40 +1,15 @@
-import { OptionType } from '@/components/input/SelectInput';
-import * as Yup from 'yup';
+import { string, object } from 'yup';
 
-export const RecordingFilterSchema = Yup.object().shape({
-  area_id: Yup.object({
-    value: Yup.number().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
-  location_id: Yup.object({
-    value: Yup.number().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
-  project_flock_id: Yup.object({
-    value: Yup.number().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
-  kandang_id: Yup.object({
-    value: Yup.number().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
-  project_flock_kandang_id: Yup.number().nullable(),
-  approval_status: Yup.object({
-    value: Yup.string().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
-  project_flock_category: Yup.object({
-    value: Yup.string().nullable(),
-    label: Yup.string().nullable(),
-  }).nullable(),
+export const RecordingFilterSchema = object().shape({
+  area_id: string().nullable(),
+  location_id: string().nullable(),
+  kandang_id: string().nullable(),
+  project_flock_kandang_id: string().nullable(),
 });
 
 export type RecordingFilterType = {
-  area_id: OptionType<number> | null;
-  location_id: OptionType<number> | null;
-  project_flock_id: OptionType<number> | null;
-  kandang_id: OptionType<number> | null;
-  project_flock_kandang_id: number | null;
-  approval_status: OptionType<string> | null;
-  project_flock_category: OptionType<string> | null;
+  area_id: string | null;
+  location_id: string | null;
+  kandang_id: string | null;
+  project_flock_kandang_id: string | null;
 };

src/components/pages/production/recording/form/RecordingForm.schema.ts

@@ -4,9 +4,7 @@ import {
   CreateGrowingRecordingPayload,
   CreateLayingRecordingPayload,
   CreateEggPayload,
-  RecordingStock,
 } from '@/types/api/production/recording';
-import { getProductWarehouseOptionLabel } from '@/lib/product-warehouse';
 
 type RecordingGrowingFormSchemaType = {
   record_date: string;
@@ -31,96 +29,63 @@ type RecordingGrowingFormSchemaType = {
   } | null;
   project_flock_kandang_id: number;
   stocks: {
-    product_warehouse_id:
-      | {
-          value: number;
-          label: string;
-        }
-      | undefined;
+    product_warehouse_id: number;
     qty: number | string;
   }[];
   depletions: {
-    product_warehouse_id?: {
-      value: number;
-      label: string;
-    } | null;
-    source_product_warehouse_id?: number;
+    product_warehouse_id?: number;
     qty?: number | string;
   }[];
 };
 
 type RecordingLayingFormSchemaType = RecordingGrowingFormSchemaType & {
   eggs: {
-    product_warehouse_id?: {
-      value: number;
-      label: string;
-    } | null;
+    product_warehouse_id?: number;
     qty?: number | string;
     weight?: number | string;
   }[];
 };
 
 export type StockSchema = {
-  product_warehouse_id: {
-    value: number;
-    label: string;
-  };
+  product_warehouse_id: number;
   qty: number | string;
 };
 
 export type DepletionSchema = {
-  product_warehouse_id?: {
-    value: number;
-    label: string;
-  } | null;
-  source_product_warehouse_id?: number;
+  product_warehouse_id?: number;
   qty?: number | string;
 };
 
 export type EggSchema = {
-  product_warehouse_id?: {
-    value: number;
-    label: string;
-  } | null;
+  product_warehouse_id?: number;
   qty?: number | string;
   weight?: number | string;
 };
 
 const StockObjectSchema: Yup.ObjectSchema<StockSchema> = Yup.object({
-  product_warehouse_id: Yup.object({
-    value: Yup.number().min(1).required(),
-    label: Yup.string().required(),
-  })
+  product_warehouse_id: Yup.number()
     .required('Produk wajib diisi!')
-    .typeError('Produk wajib diisi!'),
+    .min(1, 'Produk wajib diisi!')
+    .typeError('Produk harus berupa angka!'),
   qty: Yup.number()
     .required('Jumlah penggunaan wajib diisi!')
-    .moreThan(0, 'Jumlah penggunaan harus lebih dari 0!')
+    .min(1, 'Jumlah penggunaan tidak boleh 0!')
     .typeError('Jumlah penggunaan harus berupa angka!'),
 });
 
 const DepletionObjectSchema: Yup.ObjectSchema<DepletionSchema> = Yup.object({
-  product_warehouse_id: Yup.object({
-    value: Yup.number().min(1).required(),
-    label: Yup.string().required(),
-  })
+  product_warehouse_id: Yup.number()
     .optional()
-    .nullable(),
-  source_product_warehouse_id: Yup.number()
-    .optional()
-    .typeError('Gudang sumber harus berupa angka!'),
+    .typeError('Depletions harus berupa angka!'),
   qty: Yup.number()
     .optional()
     .typeError('Jumlah depletions harus berupa angka!'),
 });
 
 const EggObjectSchema: Yup.ObjectSchema<EggSchema> = Yup.object({
-  product_warehouse_id: Yup.object({
-    value: Yup.number().min(1).required(),
-    label: Yup.string().required(),
-  })
+  product_warehouse_id: Yup.number()
     .optional()
-    .nullable(),
+    .typeError('Kondisi telur harus berupa angka!'),
   qty: Yup.number().optional().typeError('Jumlah telur harus berupa angka!'),
   weight: Yup.number().optional().typeError('Berat telur harus berupa angka!'),
 });
@@ -278,18 +243,14 @@ export const getRecordingGrowingFormInitialValues = (
     initialValues?.project_flock?.project_flock_kandang_id ??
     0,
   stocks: initialValues?.stocks?.map((stock) => ({
-    product_warehouse_id: {
-      value: stock.product_warehouse_id,
-      label: getProductWarehouseOptionLabel(stock.product_warehouse),
-    },
+    product_warehouse_id: stock.product_warehouse_id,
     qty:
-      (stock as RecordingStock).qty ||
-      ((stock as RecordingStock).usage_amount || 0) +
-        ((stock as RecordingStock).pending_qty || 0) ||
+      (stock as { qty?: number; usage_amount?: number }).qty ||
+      (stock as { qty?: number; usage_amount?: number }).usage_amount ||
       '',
   })) ?? [
     {
-      product_warehouse_id: undefined,
+      product_warehouse_id: 0,
       qty: '',
     },
   ],
@@ -297,16 +258,12 @@ export const getRecordingGrowingFormInitialValues = (
     (
       depletion: NonNullable<CreateGrowingRecordingPayload['depletions']>[0]
     ) => ({
-      product_warehouse_id: {
-        value: Number(depletion.product_warehouse_id ?? 0),
-        label: getProductWarehouseOptionLabel(depletion.product_warehouse),
-      },
-      source_product_warehouse_id: depletion.source_product_warehouse_id,
+      product_warehouse_id: depletion.product_warehouse_id,
       qty: depletion.qty,
     })
   ) ?? [
     {
-      product_warehouse_id: undefined,
+      product_warehouse_id: 0,
       qty: '',
     },
   ],
@@ -318,15 +275,12 @@ export const getRecordingLayingFormInitialValues = (
   ...getRecordingGrowingFormInitialValues(initialValues),
 
   eggs: initialValues?.eggs?.map((egg: CreateEggPayload) => ({
-    product_warehouse_id: {
-      value: Number(egg.product_warehouse_id ?? 0),
-      label: getProductWarehouseOptionLabel(egg.product_warehouse),
-    },
+    product_warehouse_id: egg.product_warehouse_id,
     qty: egg.qty,
     weight: egg.weight,
   })) ?? [
     {
-      product_warehouse_id: null,
+      product_warehouse_id: 0,
       qty: '',
       weight: '',
     },

src/components/pages/production/recording/recording-utils.ts

@@ -1,73 +0,0 @@
-export type RecordingRestriction = {
-  canEditStock: boolean;
-  canEditDepletion: boolean;
-  canEditEgg: boolean;
-  isLocked: boolean;
-  lockReason?: string;
-};
-
-export const getRecordingRestriction = (
-  isLaying: boolean,
-  isTransition: boolean,
-  currentIsLaying?: boolean
-): RecordingRestriction => {
-  if (isTransition && !isLaying) {
-    const isLayingKandangInTransition = currentIsLaying === true;
-
-    if (isLayingKandangInTransition) {
-      return {
-        canEditStock: false,
-        canEditDepletion: true,
-        canEditEgg: true,
-        isLocked: false,
-        lockReason: undefined,
-      };
-    } else {
-      return {
-        canEditStock: true,
-        canEditDepletion: false,
-        canEditEgg: false,
-        isLocked: false,
-        lockReason: undefined,
-      };
-    }
-  }
-
-  if (!isLaying && !isTransition && currentIsLaying) {
-    return {
-      canEditStock: false,
-      canEditDepletion: false,
-      canEditEgg: false,
-      isLocked: true,
-      lockReason:
-        'Recording Growing telah terkunci karena Project Flock sudah masuk fase Laying',
-    };
-  }
-
-  if (!isLaying && !isTransition) {
-    return {
-      canEditStock: true,
-      canEditDepletion: true,
-      canEditEgg: false,
-      isLocked: false,
-      lockReason: undefined,
-    };
-  }
-  if (isLaying && !isTransition) {
-    return {
-      canEditStock: true,
-      canEditDepletion: true,
-      canEditEgg: true,
-      isLocked: false,
-      lockReason: undefined,
-    };
-  }
-
-  return {
-    canEditStock: false,
-    canEditDepletion: false,
-    canEditEgg: false,
-    isLocked: true,
-    lockReason: 'Kondisi transisi tidak valid',
-  };
-};

src/components/pages/production/transfer-to-laying/TransferToLayingConfirmationModal.tsx

@@ -50,18 +50,12 @@ const TransferToLayingConfirmationModalTable = ({
   transferToLayingForm?: TransferToLayingFormValues;
   transferToLayingId?: number;
 }) => {
-  const isValidId =
-    transferToLayingId !== undefined &&
-    transferToLayingId !== null &&
-    !isNaN(transferToLayingId) &&
-    transferToLayingId > 0;
-
   const { data: transferToLaying, isLoading: isLoadingTransferToLaying } =
     useSWR(
-      isValidId
+      transferToLayingId
         ? ['detail-transfer-to-laying', String(transferToLayingId)]
         : undefined,
-      ([, id]) => TransferToLayingApi.getSingle(Number(id))
+      ([id]) => TransferToLayingApi.getSingle(Number(id))
     );
 
   const confirmationTableColumns: ColumnDef<TransferToLayingConfirmationTableDataType>[] =
@@ -279,16 +273,12 @@ const TransferToLayingConfirmationModal = ({
 
         {transferToLayingIds &&
           !transferToLayingForm &&
-          transferToLayingIds
-            .filter(
-              (id) => id !== undefined && id !== null && !isNaN(id) && id > 0
-            )
-            .map((transferToLayingId, idx) => (
-              <TransferToLayingConfirmationModalTable
-                key={idx}
-                transferToLayingId={transferToLayingId}
-              />
-            ))}
+          transferToLayingIds.map((transferToLayingId, idx) => (
+            <TransferToLayingConfirmationModalTable
+              key={idx}
+              transferToLayingId={transferToLayingId}
+            />
+          ))}
 
         {withNote && (
           <TextArea

src/components/pages/production/transfer-to-laying/TransferToLayingDetailModal.tsx

@@ -40,9 +40,6 @@ const TransferToLayingDetailModal = () => {
     ? transferToLayingResponse.data
     : undefined;
 
-  const isTransferToLayingApproved =
-    transferToLaying?.approval.step_number === 2;
-
   const { data: transferToLayingApprovalResponse } = useSWR(
     transferToLayingId
       ? ['approval-transfer-to-laying', transferToLayingId]
@@ -58,9 +55,9 @@ const TransferToLayingDetailModal = () => {
 
   const detailModal = useModal();
 
-  const maxSourceQuantity =
+  const totalEnteredChickenForTransfer =
     transferToLaying?.sources.reduce(
-      (acc, item) => acc + Number(item.product_warehouse.quantity),
+      (acc, item) => acc + Number(item.qty),
       0
     ) ?? 0;
 
@@ -70,9 +67,8 @@ const TransferToLayingDetailModal = () => {
       0
     ) ?? 0;
 
-  // Sisa transfer = Max available dari kandang asal - Total yang sudah diisi di kandang tujuan
   const totalAvailableChickenForTransfer =
-    maxSourceQuantity - totalTransferedChicken;
+    totalEnteredChickenForTransfer - totalTransferedChicken;
 
   const closeModalHandler = (shouldPushToRoute: boolean = true) => {
     if (shouldPushToRoute) {
@@ -86,7 +82,7 @@ const TransferToLayingDetailModal = () => {
     if (modalAction === 'detail') {
       detailModal.openModal();
     }
-  }, [modalAction]);
+  }, [modalAction, detailModal]);
 
   return (
     <Modal
@@ -165,34 +161,11 @@ const TransferToLayingDetailModal = () => {
 
               {/* Source Kandang */}
               <div className='flex flex-col'>
-                <span className='w-fit py-2 text-xs font-semibold flex flex-row items-center gap-3'>
-                  <span className='text-nowrap'>
-                    Kandang Asal{' '}
-                    <span className='tooltip tooltip-error' data-tip='required'>
-                      <span className='text-error'> *</span>
-                    </span>
+                <span className='w-full py-2 text-xs font-semibold'>
+                  Kandang Asal{' '}
+                  <span className='tooltip tooltip-error' data-tip='required'>
+                    <span className='text-error'> *</span>
                   </span>
-
-                  {!isTransferToLayingApproved && (
-                    <>
-                      <div className='w-px h-5 bg-base-content/10' />
-
-                      <StatusBadge
-                        color={
-                          totalAvailableChickenForTransfer < 0
-                            ? 'error'
-                            : 'neutral'
-                        }
-                        text={`Sisa ayam: ${formatNumber(
-                          totalAvailableChickenForTransfer,
-                          'en-US'
-                        )} ekor`}
-                        className={{
-                          badge: 'text-nowrap',
-                        }}
-                      />
-                    </>
-                  )}
                 </span>
 
                 {transferToLaying?.sources.length === 0 && (
@@ -252,6 +225,21 @@ const TransferToLayingDetailModal = () => {
                       <span className='text-error'> *</span>
                     </span>
                   </span>
+
+                  <div className='w-px h-5 bg-base-content/10' />
+
+                  <StatusBadge
+                    color={
+                      totalAvailableChickenForTransfer < 0 ? 'error' : 'neutral'
+                    }
+                    text={`Sisa transfer: ${formatNumber(
+                      totalAvailableChickenForTransfer,
+                      'en-US'
+                    )} ekor`}
+                    className={{
+                      badge: 'text-nowrap',
+                    }}
+                  />
                 </span>
 
                 {transferToLaying?.targets.length === 0 && (
@@ -316,7 +304,7 @@ const TransferToLayingDetailModal = () => {
                 readOnly
                 errorMessage={
                   totalAvailableChickenForTransfer < 0
-                    ? `Jumlah transfer melebihi ketersediaan (${formatNumber(maxSourceQuantity, 'en-US')} ayam)`
+                    ? `Jumlah transfer melebihi ketersediaan (${formatNumber(totalEnteredChickenForTransfer, 'en-US')} ayam)`
                     : ''
                 }
               />

src/components/pages/production/transfer-to-laying/TransferToLayingFilterModal.tsx

@@ -13,6 +13,7 @@ import SelectInputCheckbox from '@/components/input/SelectInputCheckbox';
 import { OptionType, useSelect } from '@/components/input/SelectInput';
 import { ProjectFlockApi } from '@/services/api/production';
 import { Flock } from '@/types/api/master-data/flock';
+import { TransferToLayingFilter } from '@/types/api/production/transfer-to-laying';
 import {
   TransferToLayingFilterSchema,
   TransferToLayingFilterValues,
@@ -20,14 +21,12 @@ import {
 
 interface TransferToLayingFilterModal {
   ref: RefObject<HTMLDialogElement | null>;
-  initialValues?: Partial<TransferToLayingFilterValues>;
-  onSubmit?: (values: TransferToLayingFilterValues) => void;
+  onSubmit?: (values: TransferToLayingFilter) => void;
   onReset?: () => void;
 }
 
 const TransferToLayingFilterModal = ({
   ref,
-  initialValues: initialValuesProp,
   onSubmit,
   onReset,
 }: TransferToLayingFilterModal) => {
@@ -87,16 +86,28 @@ const TransferToLayingFilterModal = ({
 
   const formik = useFormik<TransferToLayingFilterValues>({
     initialValues: {
-      startDate: initialValuesProp?.startDate ?? '',
-      endDate: initialValuesProp?.endDate ?? '',
-      flockSource: initialValuesProp?.flockSource ?? [],
-      flockDestination: initialValuesProp?.flockDestination ?? [],
-      status: initialValuesProp?.status ?? [],
+      startDate: '',
+      endDate: '',
+      flockSource: [],
+      flockDestination: [],
+      status: [],
     },
-    enableReinitialize: true,
     validationSchema: TransferToLayingFilterSchema,
     onSubmit: async (values) => {
-      onSubmit?.(values);
+      const formattedValues = {
+        ...values,
+        flockSource: values.flockSource
+          ? (values.flockSource as OptionType[]).map((item) => item.value)
+          : [],
+        flockDestination: values.flockDestination
+          ? (values.flockDestination as OptionType[]).map((item) => item.value)
+          : [],
+        status: values.status
+          ? (values.status as OptionType[]).map((item) => item.value)
+          : [],
+      };
+
+      onSubmit?.(formattedValues as TransferToLayingFilter);
       closeModalHandler();
     },
     onReset: () => {

src/components/pages/production/transfer-to-laying/TransferToLayingFormModal.tsx

@@ -223,16 +223,12 @@ const TransferToLayingFormModal = () => {
     },
   });
 
-  const { flockSource: formikFlockSource } = formik.values;
-
   const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
 
   const [selectedFlockSourceRawData, setSelectedFlockSourceRawData] = useState<
     ProjectFlock | undefined
   >(undefined);
 
-  const [maxSourceQuantity, setMaxSourceQuantity] = useState<number>(0);
-
   const selectedFlockDestinationRawData = isResponseSuccess(
     flockDestinationRawData
   )
@@ -357,14 +353,19 @@ const TransferToLayingFormModal = () => {
     return { available: countAvailable, unavailable: countUnavailable };
   }, [mappedFlockDestinationKandangsMaxTargetQty]);
 
+  const totalEnteredChickenForTransfer =
+    formik.values.flockSourceKandangs.reduce(
+      (acc, item) => acc + Number(item.quantity),
+      0
+    );
+
   const totalTransferedChicken = formik.values.flockDestinationKandangs.reduce(
     (acc, item) => acc + Number(item.quantity),
     0
   );
 
-  // Sisa transfer = Max available dari kandang asal - Total yang sudah diisi di kandang tujuan
   const totalAvailableChickenForTransfer =
-    maxSourceQuantity - totalTransferedChicken;
+    totalEnteredChickenForTransfer - totalTransferedChicken;
 
   const isNextButtonDisabled = useMemo(() => {
     if (step === 1) {
@@ -396,7 +397,6 @@ const TransferToLayingFormModal = () => {
     formik.setFieldValue('maxTotalQuantity', '');
     formik.setFieldValue('reason', '');
     formik.setFieldTouched('reason', false);
-    setMaxSourceQuantity(0);
 
     setStep(2);
   };
@@ -404,7 +404,6 @@ const TransferToLayingFormModal = () => {
   const flockSourceChangeHandler = (val: OptionType | OptionType[] | null) => {
     formik.setFieldValue('flockSource', val);
     formik.setFieldValue('flockSourceKandangs', []);
-    setMaxSourceQuantity(0);
   };
 
   const flockDestinationChangeHandler = (
@@ -457,39 +456,19 @@ const TransferToLayingFormModal = () => {
 
   useEffect(() => {
     if (isResponseSuccess(flockSourceRawData)) {
-      const currentSelectedFlockSourceRawData = flockSourceRawData.data.find(
+      const selectedFlockSourceRawData = flockSourceRawData.data.find(
         (item) => item.id === formik.values.flockSource?.value
       );
 
-      setSelectedFlockSourceRawData(currentSelectedFlockSourceRawData);
+      setSelectedFlockSourceRawData(selectedFlockSourceRawData);
     }
-  }, [flockSourceRawData, formikFlockSource]);
+  }, [flockSourceRawData]);
 
   useEffect(() => {
     formik.setFieldValue('totalQuantity', totalTransferedChicken);
     formik.setFieldValue('maxTotalQuantity', totalTransferedChicken);
   }, [totalTransferedChicken, formik.values.flockDestinationKandangs]);
 
-  // Auto-fill source kandang quantity from total destination quantity
-  useEffect(() => {
-    if (formik.values.flockSourceKandangs.length > 0) {
-      formik.setFieldValue(
-        'flockSourceKandangs.0.quantity',
-        totalTransferedChicken
-      );
-    }
-  }, [totalTransferedChicken]);
-
-  useEffect(() => {
-    if (
-      formik.values.flockSourceKandangs.length > 0 &&
-      formik.values.flockSourceKandangs[0].maxQuantity &&
-      maxSourceQuantity === 0
-    ) {
-      setMaxSourceQuantity(formik.values.flockSourceKandangs[0].maxQuantity);
-    }
-  }, [formik.values.flockSourceKandangs, maxSourceQuantity]);
-
   return (
     <>
       <Modal
@@ -604,9 +583,14 @@ const TransferToLayingFormModal = () => {
                               k.kandang.value === item.project_flock_kandang_id
                           );
 
-                        const flockSourceKandangRadioChangeHandler = () => {
-                          if (isAvailable) {
+                        const flockSourceKandangCheckboxChangeHandler: FormEventHandler<
+                          HTMLInputElement
+                        > = (e) => {
+                          const checked = (e.target as HTMLInputElement)
+                            .checked;
+                          if (checked) {
                             formik.setFieldValue('flockSourceKandangs', [
+                              ...formik.values.flockSourceKandangs,
                               {
                                 kandang: {
                                   value: item.project_flock_kandang_id,
@@ -616,7 +600,15 @@ const TransferToLayingFormModal = () => {
                                 maxQuantity: item.available_qty,
                               },
                             ]);
-                            setMaxSourceQuantity(item.available_qty);
+                          } else {
+                            formik.setFieldValue(
+                              'flockSourceKandangs',
+                              formik.values.flockSourceKandangs.filter(
+                                (k) =>
+                                  k.kandang.value !==
+                                  item.project_flock_kandang_id
+                              )
+                            );
                           }
                         };
 
@@ -626,28 +618,32 @@ const TransferToLayingFormModal = () => {
                             className='w-full p-3 flex flex-row items-center justify-between'
                           >
                             <div className='flex flex-row items-center gap-3'>
-                              <input
-                                id={`flock-source-kandang-${item.project_flock_kandang_id}`}
-                                type='radio'
-                                name='flockSourceKandang'
+                              <CheckboxInput
+                                name={`flockSourceKandang.${itemIdx}.value`}
                                 value={item.project_flock_kandang_id}
                                 checked={isChecked}
-                                onChange={flockSourceKandangRadioChangeHandler}
+                                onChange={
+                                  flockSourceKandangCheckboxChangeHandler
+                                }
+                                size='md'
                                 disabled={!isAvailable}
-                                className={cn('radio radio-md radio-primary', {
-                                  'opacity-50 cursor-not-allowed': !isAvailable,
-                                })}
+                                classNames={{
+                                  checkbox: cn({
+                                    'bg-base-200 border border-base-content/10 opacity-100':
+                                      !isAvailable,
+                                  }),
+                                }}
                               />
 
                               <label
-                                htmlFor={`flock-source-kandang-${item.project_flock_kandang_id}`}
+                                htmlFor={`flockSourceKandang.${itemIdx}.value`}
                                 className={cn('text-sm text-base-content/50', {
                                   'cursor-pointer': isAvailable,
-                                  'cursor-not-allowed opacity-50': !isAvailable,
+                                  'cursor-not-allowed': !isAvailable,
                                 })}
                               >
                                 {item.kandang_name}{' '}
-                                <span className='text-base-content/20'>{`(Max: ${item.available_qty ?? '-'})`}</span>
+                                <span className='text-base-content/20'>{`(Max: ${item.available_qty})`}</span>
                               </label>
                             </div>
 
@@ -822,33 +818,11 @@ const TransferToLayingFormModal = () => {
 
                 {/* Source Kandang */}
                 <div className='flex flex-col'>
-                  <span className='w-fit py-2 text-xs font-semibold flex flex-row items-center gap-3'>
-                    <span className='text-nowrap'>
-                      Kandang Asal{' '}
-                      <span
-                        className='tooltip tooltip-error'
-                        data-tip='required'
-                      >
-                        <span className='text-error'> *</span>
-                      </span>
+                  <span className='w-full py-2 text-xs font-semibold'>
+                    Kandang Asal{' '}
+                    <span className='tooltip tooltip-error' data-tip='required'>
+                      <span className='text-error'> *</span>
                     </span>
-
-                    <div className='w-px h-5 bg-base-content/10' />
-
-                    <StatusBadge
-                      color={
-                        totalAvailableChickenForTransfer < 0
-                          ? 'error'
-                          : 'neutral'
-                      }
-                      text={`Sisa ayam: ${formatNumber(
-                        totalAvailableChickenForTransfer,
-                        'en-US'
-                      )} ekor`}
-                      className={{
-                        badge: 'text-nowrap',
-                      }}
-                    />
                   </span>
 
                   {formik.values.flockSourceKandangs.length === 0 && (
@@ -884,7 +858,7 @@ const TransferToLayingFormModal = () => {
                           <NumberInput
                             key={`flockSourceKandangs-${item.kandang.value}-${index}`}
                             name={`flockSourceKandangs.${index}.quantity`}
-                            placeholder='Masukkan Kuantitas pada Kandang Tujuan'
+                            placeholder='Masukkan Kuantitas'
                             value={item.quantity}
                             onChange={formik.handleChange}
                             isError={isInvalid}
@@ -901,8 +875,6 @@ const TransferToLayingFormModal = () => {
                                 <div className='w-px bg-base-content/10' />
                               </div>
                             }
-                            readOnly
-                            disabled
                             className={{
                               inputPrefix:
                                 'py-0 px-0 pl-3 text-base-content/50 bg-transparent border-r-0',
@@ -928,6 +900,23 @@ const TransferToLayingFormModal = () => {
                         <span className='text-error'> *</span>
                       </span>
                     </span>
+
+                    <div className='w-px h-5 bg-base-content/10' />
+
+                    <StatusBadge
+                      color={
+                        totalAvailableChickenForTransfer < 0
+                          ? 'error'
+                          : 'neutral'
+                      }
+                      text={`Sisa transfer: ${formatNumber(
+                        totalAvailableChickenForTransfer,
+                        'en-US'
+                      )} ekor`}
+                      className={{
+                        badge: 'text-nowrap',
+                      }}
+                    />
                   </span>
 
                   {formik.values.flockDestinationKandangs.length === 0 && (
@@ -1011,7 +1000,7 @@ const TransferToLayingFormModal = () => {
                   isError={totalAvailableChickenForTransfer < 0}
                   errorMessage={
                     totalAvailableChickenForTransfer < 0
-                      ? `Jumlah transfer melebihi ketersediaan (${formatNumber(maxSourceQuantity, 'en-US')} ayam)`
+                      ? `Jumlah transfer melebihi ketersediaan (${formatNumber(totalEnteredChickenForTransfer, 'en-US')} ayam)`
                       : ''
                   }
                   disabled

src/components/pages/production/transfer-to-laying/TransferToLayingsTable.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
+import { ChangeEventHandler, useEffect, useState } from 'react';
 import { usePathname } from 'next/navigation';
 import { useUiStore } from '@/stores/ui/ui.store';
 import useSWR from 'swr';
@@ -26,9 +26,10 @@ import TransferToLayingFilterModal from '@/components/pages/production/transfer-
 import TransferToLayingConfirmationModal from '@/components/pages/production/transfer-to-laying/TransferToLayingConfirmationModal';
 import TransferToLayingTableSkeleton from '@/components/pages/production/transfer-to-laying/skeleton/TransferToLayingTableSkeleton';
 
-import { TransferToLaying } from '@/types/api/production/transfer-to-laying';
-import { TransferToLayingFilterValues } from '@/components/pages/production/transfer-to-laying/filter/TransferToLayingFilter';
-import { OptionType } from '@/components/input/SelectInput';
+import {
+  TransferToLaying,
+  TransferToLayingFilter,
+} from '@/types/api/production/transfer-to-laying';
 import { TransferToLayingApi } from '@/services/api/production/transfer-to-laying';
 import { cn, formatDate, formatNumber } from '@/lib/helper';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
@@ -47,11 +48,11 @@ const RowOptionsMenu = ({
   popoverPosition: 'bottom' | 'top';
   deleteClickHandler: () => void;
 }) => {
-  const showEditButton = props.row.original.approval.action !== 'APPROVED';
+  const showEditButton =
+    props.row.original.approval.action !== 'APPROVED' &&
+    props.row.original.approval.action !== 'REJECTED';
 
-  const showDeleteButton =
-    props.row.original.approval.action === 'APPROVED' ||
-    props.row.original.approval.step_name.toLowerCase() === 'pengajuan';
+  const showDeleteButton = showEditButton;
 
   const popoverId = `transferToLaying#${props.row.original.id}`;
   const popoverAnchorName = `--anchor-transferToLaying#${props.row.original.id}`;
@@ -141,8 +142,6 @@ const TransferToLayingsTable = () => {
       status: '',
       filter_by: '',
       sort_by: '',
-      flockSourceNames: '',
-      flockDestinationNames: '',
     },
     paramMap: {
       page: 'page',
@@ -155,9 +154,6 @@ const TransferToLayingsTable = () => {
       filter_by: 'filter_by',
       sort_by: 'sort_by',
     },
-    excludeKeysFromUrl: ['flockSourceNames', 'flockDestinationNames'],
-    persist: true,
-    storeName: 'transfer-to-laying-table',
   });
 
   const {
@@ -435,84 +431,12 @@ const TransferToLayingsTable = () => {
     updateFilter('search', e.target.value);
   };
 
-  const STATUS_FILTER_OPTIONS = [
-    { value: 'PENDING', label: 'Pengajuan' },
-    { value: 'APPROVED', label: 'Disetujui' },
-    { value: 'REJECTED', label: 'Ditolak' },
-  ];
-
-  const filterModalInitialValues = useMemo(() => {
-    const flockSourceIds = tableFilterState.flockSource
-      ? tableFilterState.flockSource.split(',')
-      : [];
-    const flockSourceNameList = tableFilterState.flockSourceNames
-      ? tableFilterState.flockSourceNames.split(',')
-      : [];
-    const flockSourceOptions = flockSourceIds.filter(Boolean).map((id, i) => ({
-      value: parseInt(id),
-      label: flockSourceNameList[i] || id,
-    }));
-
-    const flockDestIds = tableFilterState.flockDestination
-      ? tableFilterState.flockDestination.split(',')
-      : [];
-    const flockDestNameList = tableFilterState.flockDestinationNames
-      ? tableFilterState.flockDestinationNames.split(',')
-      : [];
-    const flockDestOptions = flockDestIds.filter(Boolean).map((id, i) => ({
-      value: parseInt(id),
-      label: flockDestNameList[i] || id,
-    }));
-
-    const statusIds = tableFilterState.status
-      ? tableFilterState.status.split(',')
-      : [];
-    const statusOptions = statusIds.filter(Boolean).map((id) => {
-      const found = STATUS_FILTER_OPTIONS.find((opt) => opt.value === id);
-      return found || { value: id, label: id };
-    });
-
-    return {
-      startDate: tableFilterState.startDate || '',
-      endDate: tableFilterState.endDate || '',
-      flockSource: flockSourceOptions,
-      flockDestination: flockDestOptions,
-      status: statusOptions,
-    };
-  }, [
-    tableFilterState.startDate,
-    tableFilterState.endDate,
-    tableFilterState.flockSource,
-    tableFilterState.flockDestination,
-    tableFilterState.status,
-    tableFilterState.flockSourceNames,
-    tableFilterState.flockDestinationNames,
-  ]);
-
-  const filterSubmitHandler = (values: TransferToLayingFilterValues) => {
-    const flockSourceOpts = (values.flockSource as OptionType[]) || [];
-    const flockDestOpts = (values.flockDestination as OptionType[]) || [];
-    const statusOpts = (values.status as OptionType[]) || [];
-
-    updateFilter('startDate', values.startDate || '');
-    updateFilter('endDate', values.endDate || '');
-    updateFilter(
-      'flockSource',
-      flockSourceOpts.map((o) => String(o.value)).join(',')
-    );
-    updateFilter(
-      'flockDestination',
-      flockDestOpts.map((o) => String(o.value)).join(',')
-    );
-    updateFilter('status', statusOpts.map((o) => String(o.value)).join(','));
-    updateFilter(
-      'flockSourceNames',
-      flockSourceOpts.map((o) => String(o.label)).join(',')
-    );
-    updateFilter(
-      'flockDestinationNames',
-      flockDestOpts.map((o) => String(o.label)).join(',')
-    );
+  const filterSubmitHandler = (values: TransferToLayingFilter) => {
+    updateFilter('startDate', values.startDate);
+    updateFilter('endDate', values.endDate);
+    updateFilter('flockSource', values.flockSource.join(','));
+    updateFilter('flockDestination', values.flockDestination.join(','));
+    updateFilter('status', values.status.join(','));
   };
 
   const filterResetHandler = () => {
@@ -521,8 +445,6 @@ const TransferToLayingsTable = () => {
     updateFilter('flockSource', '');
     updateFilter('flockDestination', '');
     updateFilter('status', '');
-    updateFilter('flockSourceNames', '');
-    updateFilter('flockDestinationNames', '');
   };
 
   const exportToExcelHandler = async () => {
@@ -541,7 +463,7 @@ const TransferToLayingsTable = () => {
       updateFilter('filter_by', '');
       updateFilter('sort_by', '');
     }
-  }, [sorting]);
+  }, [sorting, updateFilter]);
 
   return (
     <>
@@ -636,8 +558,6 @@ const TransferToLayingsTable = () => {
                 'search',
                 'filter_by',
                 'sort_by',
-                'flockSourceNames',
-                'flockDestinationNames',
               ]}
               fieldGroups={[['startDate', 'endDate']]}
               onClick={filterModal.openModal}
@@ -750,7 +670,6 @@ const TransferToLayingsTable = () => {
 
       <TransferToLayingFilterModal
         ref={filterModal.ref}
-        initialValues={filterModalInitialValues}
         onSubmit={filterSubmitHandler}
         onReset={filterResetHandler}
       />

src/components/pages/production/uniformity/detail/UniformityDetail.tsx

@@ -60,25 +60,6 @@ const UniformityDetail: React.FC<UniformityDetailProps> = ({
     router.push(`/production/uniformity?action=reject&id=${initialValues.id}`);
   };
 
-  const handleViewUniformityDetails = () => {
-    if (!uniformity_details || uniformity_details.length === 0) {
-      setShouldFetchDetails(true);
-      return;
-    }
-
-    setExpandedDrawerContent(
-      <UniformityDetailsPreview
-        info_umum={initialValues.info_umum}
-        uniformity_details={uniformity_details}
-        uniformityId={initialValues.id}
-      />
-    );
-
-    setTimeout(() => {
-      setExpandedDrawerOpen(true);
-    }, 0);
-  };
-
   useEffect(() => {
     if (
       shouldFetchDetails &&
@@ -202,6 +183,25 @@ const UniformityDetail: React.FC<UniformityDetailProps> = ({
           }
 
           if (id === 'document-name') {
+            const handleViewUniformityDetails = () => {
+              if (!uniformity_details || uniformity_details.length === 0) {
+                setShouldFetchDetails(true);
+                return;
+              }
+
+              setExpandedDrawerContent(
+                <UniformityDetailsPreview
+                  info_umum={initialValues.info_umum}
+                  uniformity_details={uniformity_details}
+                  uniformityId={initialValues.id}
+                />
+              );
+
+              setTimeout(() => {
+                setExpandedDrawerOpen(true);
+              }, 0);
+            };
+
             return (
               <div className='flex items-center gap-2'>
                 <span>{valueMap[id]}</span>
@@ -231,7 +231,14 @@ const UniformityDetail: React.FC<UniformityDetailProps> = ({
         },
       },
     ],
-    [initialValues, handleViewUniformityDetails, isLoading]
+    [
+      initialValues,
+      isLoading,
+      uniformity_details,
+      setShouldFetchDetails,
+      setExpandedDrawerContent,
+      setExpandedDrawerOpen,
+    ]
   );
 
   const samplingTableData: DetailOptionType[] = useMemo(() => {

src/components/pages/production/uniformity/form/UniformityForm.schema.ts

@@ -3,6 +3,7 @@ import { Uniformity } from '@/types/api/production/uniformity';
 
 type UniformityFormSchemaType = {
   date: string;
+  week: number;
   location?: {
     value: number;
     label: string;
@@ -44,6 +45,10 @@ const FileSchema = Yup.mixed<File>()
 export const UniformityFormSchema: Yup.ObjectSchema<UniformityFormSchemaType> =
   Yup.object({
     date: Yup.string().required('Tanggal wajib diisi!'),
+    week: Yup.number()
+      .min(1, 'Minggu ke wajib diisi!')
+      .required('Minggu ke wajib diisi!')
+      .typeError('Minggu ke wajib diisi!'),
     location: Yup.object({
       value: Yup.number().min(1).required(),
       label: Yup.string().required(),
@@ -76,6 +81,7 @@ export type UniformityFormValues = Yup.InferType<typeof UniformityFormSchema>;
 
 export type UniformityFormData = {
   date: string;
+  week: number;
   project_flock_kandang_id: number;
   document: File | null;
   document_name: string;
@@ -85,7 +91,8 @@ export const getUniformityFormInitialValues = (
   initialValues?: Partial<Uniformity>
 ): UniformityFormValues => {
   return {
-    date: '',
+    date: initialValues?.week ? '' : '',
+    week: initialValues?.week ?? 0,
     location: null,
     location_id: 0,
     project_flock: null,

src/components/pages/production/uniformity/form/UniformityForm.tsx

@@ -27,6 +27,7 @@ import { LocationApi } from '@/services/api/master-data';
 import {
   ProjectFlockApi,
   ProjectFlockKandangApi,
+  RecordingApi,
 } from '@/services/api/production';
 import { UniformityApi } from '@/services/api/uniformity';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
@@ -39,6 +40,7 @@ import {
   ProjectFlockKandangLookup,
   ProjectFlock,
 } from '@/types/api/production/project-flock';
+import { Recording } from '@/types/api/production/recording';
 import { Kandang } from '@/types/api/master-data/kandang';
 import UniformityPreviewForm from '@/components/pages/production/uniformity/form/UniformityPreviewForm';
 import UniformityResultForm from '@/components/pages/production/uniformity/form/UniformityResultForm';
@@ -202,6 +204,23 @@ const UniformityForm = ({
       ? projectFlockKandangLookupData.data
       : undefined;
 
+  // ===== RECORDINGS DATA (FOR WEEK CALCULATION) =====
+  const recordingsUrl = useMemo(() => {
+    if (!projectFlockKandangLookup?.project_flock_kandang_id) return null;
+    const params = new URLSearchParams({
+      page: '1',
+      limit: '100',
+      project_flock_kandang_id:
+        projectFlockKandangLookup.project_flock_kandang_id.toString(),
+    });
+    return `${RecordingApi.basePath}?${params.toString()}`;
+  }, [projectFlockKandangLookup?.project_flock_kandang_id]);
+
+  const { data: recordingsData } = useSWR(
+    recordingsUrl,
+    recordingsUrl ? RecordingApi.getAllFetcher : null
+  );
+
   // ===== FORM CONFIGURATION =====
   const formikInitialValues = useMemo<UniformityFormValues>(
     () => getUniformityFormInitialValues(initialValues),
@@ -227,6 +246,7 @@ const UniformityForm = ({
 
       setUniformityFormData({
         date: values.date,
+        week: values.week,
         project_flock_kandang_id: projectFlockKandangId,
         document: values.document as File,
         document_name: (values.document as File).name,
@@ -455,6 +475,59 @@ const UniformityForm = ({
     generateUniformityTemplate(population, projectFlockKandangLookup);
   }, [projectFlockKandangLookup]);
 
+  // ===== SIDE EFFECTS =====
+  useEffect(() => {
+    if (
+      projectFlockKandangLookup?.chick_in_date &&
+      projectFlockKandangLookup?.project_flock_kandang_id
+    ) {
+      const chickInDate = new Date(projectFlockKandangLookup.chick_in_date);
+      chickInDate.setHours(0, 0, 0, 0);
+
+      let initialWeek = 18;
+
+      if (
+        isResponseSuccess(recordingsData) &&
+        recordingsData.data &&
+        recordingsData.data.length > 0
+      ) {
+        const sortedRecordings = [...recordingsData.data].sort(
+          (a: Recording, b: Recording) =>
+            new Date(a.record_datetime).getTime() -
+            new Date(b.record_datetime).getTime()
+        );
+
+        const earliestRecording = sortedRecordings[0];
+        if (earliestRecording?.project_flock?.production_standart?.week) {
+          initialWeek =
+            earliestRecording.project_flock.production_standart.week;
+        }
+      }
+
+      if (formik.values.date) {
+        const selectedDate = new Date(formik.values.date);
+        selectedDate.setHours(0, 0, 0, 0);
+
+        const daysDiff = Math.floor(
+          (selectedDate.getTime() - chickInDate.getTime()) /
+            (1000 * 60 * 60 * 24)
+        );
+
+        const weeksDiff = Math.floor(daysDiff / 7);
+
+        setFieldValue('week', initialWeek + weeksDiff);
+      } else {
+        setFieldValue('week', initialWeek);
+      }
+    }
+  }, [
+    projectFlockKandangLookup?.chick_in_date,
+    projectFlockKandangLookup?.project_flock_kandang_id,
+    recordingsData,
+    formik.values.date,
+    setFieldValue,
+  ]);
+
   useEffect(() => {
     const unsub = subscribeValidate(() => {
       setIsValid(true);
@@ -524,7 +597,6 @@ const UniformityForm = ({
               onBlur={formik.handleBlur}
               isError={formik.touched.date && Boolean(formik.errors.date)}
               errorMessage={formik.errors.date as string}
-              disabled={isNextStep}
             />
 
             <SelectInput
@@ -543,7 +615,6 @@ const UniformityForm = ({
               errorMessage={formik.errors.location_id as string}
               isClearable
               className={{ wrapper: 'w-full' }}
-              isDisabled={isNextStep}
             />
 
             <SelectInput
@@ -556,7 +627,7 @@ const UniformityForm = ({
               onInputChange={setProjectFlockSearchValue}
               isLoading={isLoadingProjectFlocks}
               onMenuScrollToBottom={loadMoreProjectFlocks}
-              isDisabled={!formik.values.location_id || isNextStep}
+              isDisabled={!formik.values.location_id}
               isError={
                 formik.touched.project_flock_id &&
                 Boolean(formik.errors.project_flock_id)
@@ -573,7 +644,7 @@ const UniformityForm = ({
               value={formik.values.kandang}
               onChange={handleKandangChange}
               options={kandangOptions}
-              isDisabled={!formik.values.project_flock_id || isNextStep}
+              isDisabled={!formik.values.project_flock_id}
               isError={
                 formik.touched.kandang_id && Boolean(formik.errors.kandang_id)
               }