refactor(FE-208): rename PurchaseRequisitions to PurchaseRequest and update related API references

This commit is contained in:
rstubryan
2025-11-17 09:21:18 +07:00
parent 64605b168e
commit c951f09667
12 changed files with 118 additions and 135 deletions
@@ -11,14 +11,14 @@ import NumberInput from '@/components/input/NumberInput';
import SelectInput, { OptionType } from '@/components/input/SelectInput';
import {
PurchaseRequisitionsAcceptApprovalFormDefaultValues,
PurchaseRequisitionsAcceptApprovalFormInitialValues,
PurchaseRequisitionsAcceptApprovalFormSchema,
PurchaseRequestAcceptApprovalFormDefaultValues,
PurchaseRequestAcceptApprovalFormInitialValues,
PurchaseRequestAcceptApprovalFormSchema,
} from './PurchaseOrderForm.schema';
import { isResponseError } from '@/lib/api-helper';
import { AcceptApprovalApi } from '@/services/api/purchase';
import {
CreateAcceptApprovalRequisitionsPayload,
CreateAcceptApprovalRequestPayload,
Purchase,
} from '@/types/api/purchase/purchase';
import DateInput from '@/components/input/DateInput';
@@ -101,7 +101,7 @@ const PurchaseOrderAcceptApprovalForm = ({
// ===== SUBMISSION HANDLERS =====
const createAcceptApprovalHandler = useCallback(
async (payload: CreateAcceptApprovalRequisitionsPayload) => {
async (payload: CreateAcceptApprovalRequestPayload) => {
const purchaseRequisitionId = searchParams.get('purchaseId')
? parseInt(searchParams.get('purchaseId')!)
: initialValues?.id || 1;
@@ -127,10 +127,7 @@ const PurchaseOrderAcceptApprovalForm = ({
);
const updateAcceptApprovalHandler = useCallback(
async (
purchaseId: number,
payload: CreateAcceptApprovalRequisitionsPayload
) => {
async (purchaseId: number, payload: CreateAcceptApprovalRequestPayload) => {
const res = await AcceptApprovalApi.acceptApproval(purchaseId, payload);
if (isResponseError(res)) {
setPurchaseOrderFormErrorMessage(res.message);
@@ -146,17 +143,17 @@ const PurchaseOrderAcceptApprovalForm = ({
// ===== FORM CONFIGURATION =====
const formikInitialValues = useMemo(() => {
return initialValues
? PurchaseRequisitionsAcceptApprovalFormDefaultValues(initialValues)
: PurchaseRequisitionsAcceptApprovalFormInitialValues;
? PurchaseRequestAcceptApprovalFormDefaultValues(initialValues)
: PurchaseRequestAcceptApprovalFormInitialValues;
}, [initialValues]);
const formik = useFormik({
initialValues: formikInitialValues,
validationSchema: PurchaseRequisitionsAcceptApprovalFormSchema,
validationSchema: PurchaseRequestAcceptApprovalFormSchema,
validateOnChange: true,
validateOnBlur: true,
onSubmit: async (values) => {
const payload: CreateAcceptApprovalRequisitionsPayload = {
const payload: CreateAcceptApprovalRequestPayload = {
notes: values.notes || '',
items: (values.items || []).map((item) => ({
purchase_item_id:
@@ -1,7 +1,7 @@
import * as Yup from 'yup';
import { Purchase } from '@/types/api/purchase/purchase';
type PurchaseRequisitionsStaffApprovalFormSchemaType = {
type PurchaseRequestStaffApprovalFormSchemaType = {
notes: string | null;
items: {
purchase_item?: {
@@ -14,11 +14,11 @@ type PurchaseRequisitionsStaffApprovalFormSchemaType = {
}[];
};
type PurchaseRequisitionsManagerApprovalFormSchemaType = {
type PurchaseRequestManagerApprovalFormSchemaType = {
notes: string | null;
};
type PurchaseRequisitionsAcceptApprovalFormSchemaType = {
type PurchaseRequestAcceptApprovalFormSchemaType = {
notes: string | null;
items: {
purchase_item?: {
@@ -128,7 +128,7 @@ const PurchaseStaffApprovalItemObjectSchema: Yup.ObjectSchema<PurchaseStaffAppro
),
});
const PurchaseManagerApprovalObjectSchema: Yup.ObjectSchema<PurchaseRequisitionsManagerApprovalFormSchemaType> =
const PurchaseManagerApprovalObjectSchema: Yup.ObjectSchema<PurchaseRequestManagerApprovalFormSchemaType> =
Yup.object({
notes: Yup.string().nullable().default(null),
});
@@ -239,7 +239,7 @@ const PurchaseAcceptApprovalItemObjectSchema: Yup.ObjectSchema<PurchaseAcceptApp
.typeError('Total biaya transport harus berupa angka!'),
});
export const PurchaseRequisitionsStaffApprovalFormSchema: Yup.ObjectSchema<PurchaseRequisitionsStaffApprovalFormSchemaType> =
export const PurchaseRequestStaffApprovalFormSchema: Yup.ObjectSchema<PurchaseRequestStaffApprovalFormSchemaType> =
Yup.object({
notes: Yup.string().nullable().default(null),
items: Yup.array()
@@ -249,7 +249,7 @@ export const PurchaseRequisitionsStaffApprovalFormSchema: Yup.ObjectSchema<Purch
.typeError('Item pembelian wajib diisi!'),
});
export const PurchaseRequisitionsStaffApprovalFormInitialValues: PurchaseRequisitionsStaffApprovalFormSchemaType =
export const PurchaseRequestStaffApprovalFormInitialValues: PurchaseRequestStaffApprovalFormSchemaType =
{
notes: '',
items: [
@@ -261,9 +261,9 @@ export const PurchaseRequisitionsStaffApprovalFormInitialValues: PurchaseRequisi
],
};
export const PurchaseRequisitionsStaffApprovalFormDefaultValues = (
export const PurchaseRequestStaffApprovalFormDefaultValues = (
purchase?: Purchase
): PurchaseRequisitionsStaffApprovalFormSchemaType => {
): PurchaseRequestStaffApprovalFormSchemaType => {
return {
notes: purchase?.notes ?? null,
items: purchase?.items
@@ -282,26 +282,26 @@ export const PurchaseRequisitionsStaffApprovalFormDefaultValues = (
};
};
export type PurchaseRequisitionsStaffApprovalFormValues = Yup.InferType<
typeof PurchaseRequisitionsStaffApprovalFormSchema
export type PurchaseRequestStaffApprovalFormValues = Yup.InferType<
typeof PurchaseRequestStaffApprovalFormSchema
>;
export const PurchaseRequisitionsManagerApprovalFormSchema: Yup.ObjectSchema<PurchaseRequisitionsManagerApprovalFormSchemaType> =
export const PurchaseRequestManagerApprovalFormSchema: Yup.ObjectSchema<PurchaseRequestManagerApprovalFormSchemaType> =
PurchaseManagerApprovalObjectSchema;
export const PurchaseRequisitionsManagerApprovalFormDefaultValues = (
export const PurchaseRequestManagerApprovalFormDefaultValues = (
purchase?: Purchase
): PurchaseRequisitionsManagerApprovalFormSchemaType => {
): PurchaseRequestManagerApprovalFormSchemaType => {
return {
notes: purchase?.notes ?? null,
};
};
export type PurchaseRequisitionsManagerApprovalFormValues = Yup.InferType<
typeof PurchaseRequisitionsManagerApprovalFormSchema
export type PurchaseRequestManagerApprovalFormValues = Yup.InferType<
typeof PurchaseRequestManagerApprovalFormSchema
>;
export const PurchaseRequisitionsAcceptApprovalFormSchema: Yup.ObjectSchema<PurchaseRequisitionsAcceptApprovalFormSchemaType> =
export const PurchaseRequestAcceptApprovalFormSchema: Yup.ObjectSchema<PurchaseRequestAcceptApprovalFormSchemaType> =
Yup.object({
notes: Yup.string().nullable().default(null),
items: Yup.array()
@@ -311,7 +311,7 @@ export const PurchaseRequisitionsAcceptApprovalFormSchema: Yup.ObjectSchema<Purc
.typeError('Item pembelian wajib diisi!'),
});
export const PurchaseRequisitionsAcceptApprovalFormInitialValues: PurchaseRequisitionsAcceptApprovalFormSchemaType =
export const PurchaseRequestAcceptApprovalFormInitialValues: PurchaseRequestAcceptApprovalFormSchemaType =
{
notes: '',
items: [
@@ -330,9 +330,9 @@ export const PurchaseRequisitionsAcceptApprovalFormInitialValues: PurchaseRequis
],
};
export const PurchaseRequisitionsAcceptApprovalFormDefaultValues = (
export const PurchaseRequestAcceptApprovalFormDefaultValues = (
purchase?: Purchase
): PurchaseRequisitionsAcceptApprovalFormSchemaType => {
): PurchaseRequestAcceptApprovalFormSchemaType => {
return {
notes: purchase?.notes ?? null,
items: purchase?.items
@@ -365,6 +365,6 @@ export const PurchaseRequisitionsAcceptApprovalFormDefaultValues = (
};
};
export type PurchaseRequisitionsAcceptApprovalFormValues = Yup.InferType<
typeof PurchaseRequisitionsAcceptApprovalFormSchema
export type PurchaseRequestAcceptApprovalFormValues = Yup.InferType<
typeof PurchaseRequestAcceptApprovalFormSchema
>;
@@ -11,14 +11,14 @@ import NumberInput from '@/components/input/NumberInput';
import SelectInput, { OptionType } from '@/components/input/SelectInput';
import {
PurchaseRequisitionsStaffApprovalFormDefaultValues,
PurchaseRequisitionsStaffApprovalFormInitialValues,
PurchaseRequisitionsStaffApprovalFormSchema,
PurchaseRequestStaffApprovalFormDefaultValues,
PurchaseRequestStaffApprovalFormInitialValues,
PurchaseRequestStaffApprovalFormSchema,
} from './PurchaseOrderForm.schema';
import { isResponseError } from '@/lib/api-helper';
import { StaffApprovalApi } from '@/services/api/purchase';
import {
CreateStaffApprovalRequisitionsPayload,
CreateStaffApprovalRequestPayload,
Purchase,
} from '@/types/api/purchase/purchase';
@@ -78,7 +78,7 @@ const PurchaseOrderStaffApprovalForm = ({
// ===== SUBMISSION HANDLERS =====
const createStaffApprovalHandler = useCallback(
async (payload: CreateStaffApprovalRequisitionsPayload) => {
async (payload: CreateStaffApprovalRequestPayload) => {
const purchaseRequisitionId = searchParams.get('purchaseId')
? parseInt(searchParams.get('purchaseId')!)
: initialValues?.id || 1;
@@ -104,10 +104,7 @@ const PurchaseOrderStaffApprovalForm = ({
);
const updateStaffApprovalHandler = useCallback(
async (
purchaseId: number,
payload: CreateStaffApprovalRequisitionsPayload
) => {
async (purchaseId: number, payload: CreateStaffApprovalRequestPayload) => {
const res = await StaffApprovalApi.createStaffApproval(
purchaseId,
payload
@@ -126,17 +123,17 @@ const PurchaseOrderStaffApprovalForm = ({
// ===== FORM CONFIGURATION =====
const formikInitialValues = useMemo(() => {
return initialValues
? PurchaseRequisitionsStaffApprovalFormDefaultValues(initialValues)
: PurchaseRequisitionsStaffApprovalFormInitialValues;
? PurchaseRequestStaffApprovalFormDefaultValues(initialValues)
: PurchaseRequestStaffApprovalFormInitialValues;
}, [initialValues]);
const formik = useFormik({
initialValues: formikInitialValues,
validationSchema: PurchaseRequisitionsStaffApprovalFormSchema,
validationSchema: PurchaseRequestStaffApprovalFormSchema,
validateOnChange: true,
validateOnBlur: true,
onSubmit: async (values) => {
const payload: CreateStaffApprovalRequisitionsPayload = {
const payload: CreateStaffApprovalRequestPayload = {
notes: values.notes || '',
items: (values.items || []).map((item) => ({
purchase_item_id: