From e9238e2bb5ccfb2698763605b7de2d0211bf563d Mon Sep 17 00:00:00 2001 From: rstubryan Date: Mon, 26 Jan 2026 11:45:57 +0700 Subject: [PATCH 1/7] feat(FE): Persist search in UI store and reset on exit --- .../product-category/ProductCategoryTable.tsx | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/components/pages/master-data/product-category/ProductCategoryTable.tsx b/src/components/pages/master-data/product-category/ProductCategoryTable.tsx index e25dfd56..11199c73 100644 --- a/src/components/pages/master-data/product-category/ProductCategoryTable.tsx +++ b/src/components/pages/master-data/product-category/ProductCategoryTable.tsx @@ -1,6 +1,6 @@ 'use client'; -import { ChangeEventHandler, useEffect, useState } from 'react'; +import { ChangeEventHandler, useEffect, useRef, useState } from 'react'; import useSWR from 'swr'; import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table'; import toast from 'react-hot-toast'; @@ -22,6 +22,7 @@ import { ProductCategoryApi } from '@/services/api/master-data'; import { cn } from '@/lib/helper'; import { isResponseError, isResponseSuccess } from '@/lib/api-helper'; import { useTableFilter } from '@/services/hooks/useTableFilter'; +import { useUiStore } from '@/stores/ui/ui.store'; import { ROWS_OPTIONS } from '@/config/constant'; const RowOptionsMenu = ({ @@ -80,6 +81,9 @@ const RowOptionsMenu = ({ }; const ProductCategoryTable = () => { + const { searchValue, setSearchValue, resetSearchValue } = useUiStore(); + const previousPathRef = useRef(null); + const { state: tableFilterState, updateFilter, @@ -87,7 +91,7 @@ const ProductCategoryTable = () => { setPageSize, toQueryString: getTableFilterQueryString, } = useTableFilter({ - initial: { search: '', nameSort: '' }, + initial: { search: searchValue, nameSort: '' }, paramMap: { page: 'page', pageSize: 'limit', nameSort: 'sort_name' }, }); @@ -188,6 +192,7 @@ const ProductCategoryTable = () => { }; const searchChangeHandler: ChangeEventHandler = (e) => { + setSearchValue(e.target.value); updateFilter('search', e.target.value); }; @@ -196,6 +201,28 @@ const ProductCategoryTable = () => { setPageSize(newVal.value as number); }; + useEffect(() => { + // Store current path on mount + previousPathRef.current = window.location.pathname; + + return () => { + const currentPath = window.location.pathname; + + // if both paths are within /master-data/product-category module + const isCurrentPathProductCategory = currentPath.includes( + '/master-data/product-category' + ); + const isPreviousPathProductCategory = previousPathRef.current?.includes( + '/master-data/product-category' + ); + + // reset if we outside product category module entirely + if (isPreviousPathProductCategory && !isCurrentPathProductCategory) { + resetSearchValue(); + } + }; + }, [resetSearchValue]); + useEffect(() => { const isNameSorted = sorting.find((sortItem) => sortItem.id === 'name'); if (!isNameSorted) { From 2a03eae8a2ef61bfa58599ae1c0f34eb22b8e626 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Mon, 26 Jan 2026 13:35:45 +0700 Subject: [PATCH 2/7] refactor(FE): Remove section padding on small+ screens --- src/app/expense/page.tsx | 2 +- src/app/inventory/movement/page.tsx | 2 +- src/app/production/recording/page.tsx | 2 +- src/app/purchase/page.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/expense/page.tsx b/src/app/expense/page.tsx index d6b00286..0bd5d406 100644 --- a/src/app/expense/page.tsx +++ b/src/app/expense/page.tsx @@ -2,7 +2,7 @@ import ExpensesTable from '@/components/pages/expense/ExpensesTable'; const Expense = () => { return ( -
+
); diff --git a/src/app/inventory/movement/page.tsx b/src/app/inventory/movement/page.tsx index a2c25612..10717059 100644 --- a/src/app/inventory/movement/page.tsx +++ b/src/app/inventory/movement/page.tsx @@ -2,7 +2,7 @@ import MovementTable from '@/components/pages/inventory/movement/MovementTable'; const Movement = () => { return ( -
+
); diff --git a/src/app/production/recording/page.tsx b/src/app/production/recording/page.tsx index f31ac19a..471ef648 100644 --- a/src/app/production/recording/page.tsx +++ b/src/app/production/recording/page.tsx @@ -2,7 +2,7 @@ import RecordingTable from '@/components/pages/production/recording/RecordingTab const Recording = () => { return ( -
+
); diff --git a/src/app/purchase/page.tsx b/src/app/purchase/page.tsx index dc25a99d..ea2bb95b 100644 --- a/src/app/purchase/page.tsx +++ b/src/app/purchase/page.tsx @@ -2,7 +2,7 @@ import PurchaseTable from '@/components/pages/purchase/PurchaseTable'; const Purchase = () => { return ( -
+
); From afb0c40fd2b1a6ad622ff6de78f9bd35868a47ed Mon Sep 17 00:00:00 2001 From: rstubryan Date: Mon, 26 Jan 2026 13:37:06 +0700 Subject: [PATCH 3/7] refactor(FE): Add Status Approval column to PurchaseTable --- .../pages/purchase/PurchaseTable.tsx | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/components/pages/purchase/PurchaseTable.tsx b/src/components/pages/purchase/PurchaseTable.tsx index 81f45cc9..9af19b42 100644 --- a/src/components/pages/purchase/PurchaseTable.tsx +++ b/src/components/pages/purchase/PurchaseTable.tsx @@ -16,6 +16,7 @@ import RowDropdownOptions from '@/components/table/RowDropdownOptions'; import RowCollapseOptions from '@/components/table/RowCollapseOptions'; import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper'; import RequirePermission from '@/components/helper/RequirePermission'; +import Badge from '@/components/Badge'; import { cn, formatDate } from '@/lib/helper'; import { isResponseSuccess } from '@/lib/api-helper'; @@ -153,6 +154,57 @@ const PurchaseTable = () => { return `${diffDays} hari`; }, }, + { + header: 'Status Approval', + cell: (props) => { + const approval = props.row.original.latest_approval; + if (!approval) return '-'; + + const isRejected = approval.action === 'REJECTED'; + + let statusColor: + | 'warning' + | 'success' + | 'neutral' + | 'error' + | 'primary' + | 'info' = 'neutral'; + + switch (approval.step_number) { + case 1: + statusColor = 'neutral'; + break; + case 2: + statusColor = 'primary'; + break; + case 3: + statusColor = 'info'; + break; + case 4: + statusColor = 'warning'; + break; + case 5: + statusColor = 'success'; + break; + } + + if (isRejected) { + statusColor = 'error'; + } + + return ( + + {isRejected ? 'Ditolak' : approval.step_name} + + ); + }, + }, { header: 'Aksi', cell: (props) => { From 4011d261930513723e3313faa016c55d96e69a10 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Mon, 26 Jan 2026 13:45:32 +0700 Subject: [PATCH 4/7] refactor(FE): Make approval and action buttons responsive --- src/components/pages/purchase/order/PurchaseOrderDetail.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/pages/purchase/order/PurchaseOrderDetail.tsx b/src/components/pages/purchase/order/PurchaseOrderDetail.tsx index 47dbc8f0..1f8dd3c9 100644 --- a/src/components/pages/purchase/order/PurchaseOrderDetail.tsx +++ b/src/components/pages/purchase/order/PurchaseOrderDetail.tsx @@ -605,7 +605,7 @@ const PurchaseOrderDetail = ({ return (
{/* Approval and Action Buttons */} -
+