gitea-admin/lti-web-client
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-web-client.git synced 2026-05-25 15:55:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/inventory-adjustment' into 'development'

Browse Source 
[FIX/FE] Inventory Adjustment

See merge request mbugroup/lti-web-client!350
This commit is contained in:
Rivaldi A N S
2026-03-16 02:43:48 +00:00
parent 0c42bfd70c 0f7a2bd796
commit 710be88794
3 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/input/SelectInput.tsx
+2 -2
View File
@@ -24,8 +24,8 @@ import {
} from '@/types/api/api-general'; } from '@/types/api/api-general';
import { isResponseError, isResponseSuccess } from '@/lib/api-helper'; import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
export interface OptionType { export interface OptionType<T = string | number> {
value: string | number; value: T;
label: string; label: string;
className?: string; className?: string;
labelClassName?: string; labelClassName?: string;
src/components/pages/inventory/adjustment/InventoryAdjustmentTable.tsx
+8 -20
View File
@@ -80,13 +80,13 @@ const InventoryAdjustmentTable = () => {
const formik = useFormik<AdjustmentFilterType>({ const formik = useFormik<AdjustmentFilterType>({
initialValues: { initialValues: {
product_id: null, product_id: null,
warehouse_id: null, warehouse: null,
transaction_type: null, transaction_type: null,
}, },
validationSchema: AdjustmentFilterSchema, validationSchema: AdjustmentFilterSchema,
onSubmit: (values, { setSubmitting }) => { onSubmit: (values, { setSubmitting }) => {
updateFilter('productFilter', values.product_id || ''); updateFilter('productFilter', values.product_id || '');
updateFilter('warehouseFilter', values.warehouse_id || ''); updateFilter('warehouseFilter', String(values.warehouse?.value) || '');
updateFilter('transactionTypeFilter', values.transaction_type || ''); updateFilter('transactionTypeFilter', values.transaction_type || '');
filterModal.closeModal(); filterModal.closeModal();
setSubmitting(false); setSubmitting(false);
@@ -142,14 +142,11 @@ const InventoryAdjustmentTable = () => {
[formik] [formik]
); );
const handleFilterWarehouseChange = useCallback( const handleFilterWarehouseChange = (
(val: OptionType | OptionType[] | null) => { val: OptionType | OptionType[] | null
const warehouse = val as OptionType | null; ) => {
const warehouseId = warehouse?.value ? String(warehouse.value) : null; formik.setFieldValue('warehouse', val);
formik.setFieldValue('warehouse_id', warehouseId); };
},
[formik]
);
const handleFilterTransactionTypeChange = useCallback( const handleFilterTransactionTypeChange = useCallback(
(val: OptionType | OptionType[] | null) => { (val: OptionType | OptionType[] | null) => {
@@ -170,15 +167,6 @@ const InventoryAdjustmentTable = () => {
); );
}, [formik.values.product_id, productOptions]); }, [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(() => { const transactionTypeValue = useMemo(() => {
if (!formik.values.transaction_type) return null; if (!formik.values.transaction_type) return null;
return ( return (
@@ -502,7 +490,7 @@ const InventoryAdjustmentTable = () => {
label='Gudang' label='Gudang'
placeholder='Pilih Gudang' placeholder='Pilih Gudang'
options={warehouseOptions} options={warehouseOptions}
value={warehouseIdValue} value={formik.values.warehouse}
onChange={handleFilterWarehouseChange} onChange={handleFilterWarehouseChange}
onInputChange={setWarehouseInputValue} onInputChange={setWarehouseInputValue}
isLoading={isLoadingWarehouseOptions} isLoading={isLoadingWarehouseOptions}
src/components/pages/inventory/adjustment/filter/AdjustmentFilter.ts
+2 -1
View File
@@ -1,4 +1,5 @@
import { string, object } from 'yup'; import { string, object } from 'yup';
import { OptionType } from '@/components/input/SelectInput';
export const AdjustmentFilterSchema = object().shape({ export const AdjustmentFilterSchema = object().shape({
product_id: string().nullable(), product_id: string().nullable(),
@@ -8,6 +9,6 @@ export const AdjustmentFilterSchema = object().shape({
export type AdjustmentFilterType = { export type AdjustmentFilterType = {
product_id: string | null; product_id: string | null;
warehouse_id: string | null;
transaction_type: string | null; transaction_type: string | null;
warehouse: OptionType<number> | null;
}; };