TIMOR-TELECOM/revenue-fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix alert empty validation on manage menu

Browse Source
This commit is contained in:
Wikzyy
2025-05-08 15:06:05 +07:00
parent daff8f3686
commit 4e621eb19e
3 changed files with 281 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
src/pages/menu/manage-menu/blocks/AddDIalog.tsx
View File

@ -23,41 +23,24 @@ import {
} from '@/components/ui/select';
import { doSaveLogActivity } from '@/actions/GlobalActions';
import { RefreshCw } from 'lucide-react';
import { initialStateMenu, validateFormsMenu } from './Types';
import { NumericFormat } from 'react-number-format';
const API_URL = apiConfig.service_dashboard;
const AddDialog = () => {
const { showAddDialog, handleAddDialog, parents, selectedMenu } = useManageMenusContext();
const { reload } = useDataGrid();
const { PostData } = useCallApi();
const [open, setOpen] = useState(false);
const [alert, setAlert] = useState({
show: false,
message: ''
});
const initialState = {
module: '',
name: '',
link: '',
id_parent: '',
order_number: 0,
icon: '',
status: ''
};
const [formField, setFormField] = useState(initialState);
const [errors, setErrors] = useState<Record<string, string>>({});
const [formField, setFormField] = useState(initialStateMenu);
const [isSubmitting, setIsSubmitting] = useState(false);
const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault();
setIsSubmitting(true);
if (
formField.module.trim() === '' ||
formField.name.trim() === '' ||
formField.link.trim() === '' ||
formField.order_number === 0 ||
formField.status.trim() === ''
) {
setAlert({ show: true, message: 'Please fill in all required fields.' });
if (!validateFormsMenu(formField, setErrors)) {
setIsSubmitting(false);
return;
}
@ -78,16 +61,14 @@ const AddDialog = () => {
doSaveLogActivity(createActivity);
reload();
} else {
toast.error('Failed Create Menu');
setAlert({ show: true, message: response?.message });
toast.error(response?.message);
}
} catch (error) {
toast.error('Something went wrong, please try again');
} finally {
setIsSubmitting(false);
resetForm();
}
setAlert({ show: false, message: '' });
};
const handleAddDialogChange = (open: boolean) => {
@ -96,14 +77,11 @@ const AddDialog = () => {
if (!open) {
resetForm();
}
}
};
const resetForm = () => {
setFormField({
...initialState,
status: formField.status
});
setAlert({ show: false, message: '' });
setFormField(initialStateMenu);
setErrors({});
};
return (
@ -115,64 +93,71 @@ const AddDialog = () => {
</DialogHeader>
<DialogBody className="scrollable">
<div className="flex flex-col">
{alert.show && (
<Alert variant="danger">
<h3>{alert.message}</h3>
</Alert>
)}
<form onSubmit={handleSubmit}>
<div className="card-body grid gap-5">
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
{/* <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> */}
<label className="form-label flex items-center gap-1 max-w-56">
Module<span className="text-red-500">*</span>
</label>
<Input
className="input"
className={`input ${errors.module ? 'border-red-500' : ''}`}
type="text"
value={formField.module}
onChange={(e) => setFormField({ ...formField, module: e.target.value })}
onChange={(e) => {
setFormField({ ...formField, module: e.target.value });
setErrors({ ...errors, module: '' });
}}
/>
</div>
{/* </div> */}
{errors.module && (
<span className="text-red-500 text-xs mt-1">{errors.module}</span>
)}
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">
Name<span className="text-red-500">*</span>
</label>
<Input
className="input"
className={`input ${errors.name ? 'border-red-500' : ''}`}
type="text"
value={formField.name}
onChange={(e) => setFormField({ ...formField, name: e.target.value })}
onChange={(e) => {
setFormField({ ...formField, name: e.target.value });
setErrors({ ...errors, name: '' });
}}
/>
</div>
{errors.name && <span className="text-red-500 text-xs mt-1">{errors.name}</span>}
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">
Link<span className="text-red-500">*</span>
</label>
<Input
className="input"
className={`input ${errors.link ? 'border-red-500' : ''}`}
type="text"
value={formField.link}
onChange={(e) => setFormField({ ...formField, link: e.target.value })}
onChange={(e) => {
setFormField({ ...formField, link: e.target.value });
setErrors({ ...errors, link: '' });
}}
/>
</div>
{errors.link && <span className="text-red-500 text-xs mt-1">{errors.link}</span>}
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">Parent</label>
<Select
value={formField.id_parent}
onValueChange={(value) => setFormField({ ...formField, id_parent: value })}
onValueChange={(value) => {
setFormField({ ...formField, id_parent: value });
setErrors({ ...errors, id_parent: '' });
}}
>
<SelectTrigger>
<SelectTrigger className={errors.id_parent ? 'border-red-500' : ''}>
<SelectValue placeholder="Select As Parent" />
</SelectTrigger>
<SelectContent>
@ -184,49 +169,48 @@ const AddDialog = () => {
</SelectContent>
</Select>
</div>
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">
Order Number<span className="text-red-500">*</span>
Order Number
</label>
<Input
className="input"
type="number"
min={0}
value={formField.order_number === 0 ? '' : formField.order_number}
onChange={(e) => {
const value = parseInt(e.target.value, 10);
setFormField({ ...formField, order_number: isNaN(value) ? 0 : value });
}}
<NumericFormat
className={`input ${errors.order_number ? 'border-red-500' : ''}`}
placeholder="Order Number"
value={formField.order_number}
allowNegative={false}
onValueChange={(e) =>
setFormField({ ...formField, order_number: e.floatValue ?? null })
}
/>
</div>
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">Icon</label>
<Input
disabled
className="input"
type="text"
value={formField.icon}
onChange={(e) => setFormField({ ...formField, name: e.target.value })}
onChange={(e) => {
setFormField({ ...formField, icon: e.target.value });
setErrors({ ...errors, icon: '' });
}}
/>
</div>
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">
Status<span className="text-red-500">*</span>
</label>
<Select
value={formField.status}
onValueChange={(value) => setFormField({ ...formField, status: value })}
onValueChange={(value) => {
setFormField({ ...formField, status: value });
setErrors({ ...errors, status: '' });
}}
>
<SelectTrigger>
<SelectTrigger className={errors.status ? 'border-red-500' : ''}>
<SelectValue placeholder="Select Status" />
</SelectTrigger>
<SelectContent>
@ -234,7 +218,9 @@ const AddDialog = () => {
<SelectItem value="N">Inactive</SelectItem>
</SelectContent>
</Select>
</div>
{errors.status && (
<span className="text-red-500 text-xs mt-1">{errors.status}</span>
)}
</div>
<div className="flex justify-end gap-5">

120
src/pages/menu/manage-menu/blocks/EditDialog.tsx
View File

@ -12,7 +12,6 @@ import {
DialogHeader,
DialogTitle
} from '@/components/ui/dialog';
import { FormControl, NativeSelect } from '@mui/material';
import { Input } from '@/components/ui/input';
import { Button } from '@/components/ui/button';
import {
@ -23,6 +22,8 @@ import {
SelectValue
} from '@/components/ui/select';
import { doSaveLogActivity } from '@/actions/GlobalActions';
import { initialStateMenu, validateFormsMenu } from './Types';
import { NumericFormat } from 'react-number-format';
const API_URL = apiConfig.service_dashboard;
@ -31,36 +32,15 @@ const EditDialog = () => {
useManageMenusContext();
const { reload } = useDataGrid();
const { PutData } = useCallApi();
const [open, setOpen] = useState(false);
const [isSubmitting, setIsSubmitting] = useState(false);
const [alert, setAlert] = useState({
show: false,
message: ''
});
const initialState = {
id: '',
module: '',
name: '',
link: '',
id_parent: '',
order_number: 0,
icon: '',
status: ''
};
const [errors, setErrors] = useState<Record<string, string>>({});
const handleUpdate = async (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault();
setIsSubmitting(true);
if (
selectedMenu.module === '' ||
selectedMenu.name === '' ||
selectedMenu.link === '' ||
selectedMenu.id_parent === '' ||
selectedMenu.order_number === 0 ||
selectedMenu.status === ''
) {
setAlert({ show: true, message: 'Please fill in all required fields.' });
if (!validateFormsMenu(selectedMenu, setErrors)) {
setIsSubmitting(false);
return;
}
@ -82,21 +62,19 @@ const EditDialog = () => {
doSaveLogActivity(createActivity);
reload();
} else {
toast.error('Failed Update Menu');
setAlert({ show: true, message: response?.message });
toast.error(response?.message);
}
} catch (error) {
toast.error('Something went wrong, please trt again.');
} finally {
setIsSubmitting(false);
setErrors({});
}
setAlert({ show: false, message: '' });
};
const resetForm = () => {
setSelectedMenu(initialState);
setAlert({ show: false, message: '' });
setSelectedMenu(initialStateMenu);
setErrors({});
};
return (
@ -108,58 +86,58 @@ const EditDialog = () => {
</DialogHeader>
<DialogBody className="scrollable">
<div className="flex flex-col">
{alert.show && (
<Alert variant="danger">
<h3>{alert.message}</h3>
</Alert>
)}
<form onSubmit={handleUpdate}>
<div className="card-body grid gap-5">
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
{/* <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> */}
<label className="form-label flex items-center gap-1 max-w-56">
Module<span className="text-red-500">*</span>
</label>
<Input
className="input"
className={`input ${errors.module ? 'border-red-500' : ''}`}
type="text"
value={selectedMenu.module}
onChange={(e) => setSelectedMenu({ ...selectedMenu, module: e.target.value })}
onChange={(e) => {
setSelectedMenu({ ...selectedMenu, module: e.target.value });
setErrors({ ...errors, module: '' });
}}
/>
</div>
{errors.module && (
<span className="text-red-500 text-xs mt-1">{errors.module}</span>
)}
{/* </div> */}
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">
Name<span className="text-red-500">*</span>
</label>
<Input
className="input"
className={`input ${errors.name ? 'border-red-500' : ''}`}
type="text"
value={selectedMenu.name}
onChange={(e) => setSelectedMenu({ ...selectedMenu, name: e.target.value })}
onChange={(e) => {
setSelectedMenu({ ...selectedMenu, name: e.target.value });
setErrors({ ...errors, name: '' });
}}
/>
</div>
{errors.name && <span className="text-red-500 text-xs mt-1">{errors.name}</span>}
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">
Link<span className="text-red-500">*</span>
</label>
<Input
className="input"
className={`input ${errors.link ? 'border-red-500' : ''}`}
type="text"
value={selectedMenu.link}
onChange={(e) => setSelectedMenu({ ...selectedMenu, link: e.target.value })}
/>
</div>
{errors.link && <span className="text-red-500 text-xs mt-1">{errors.link}</span>}
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">Parent</label>
<Select
value={selectedMenu.id_parent || ''}
@ -168,9 +146,10 @@ const EditDialog = () => {
...selectedMenu,
id_parent: value === '' ? null : value
});
setErrors({ ...errors, id_parent: '' });
}}
>
<SelectTrigger>
<SelectTrigger className={errors.id_parent ? 'border-red-500' : ''}>
<SelectValue placeholder="Select As Parent" />
</SelectTrigger>
<SelectContent>
@ -181,32 +160,26 @@ const EditDialog = () => {
))}
</SelectContent>
</Select>
</div>
{errors.id_parent && (
<span className="text-red-500 text-xs mt-1">{errors.id_parent}</span>
)}
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">
Order Number<span className="text-red-500">*</span>
Order Number
</label>
<Input
className="input"
type="number"
min={0}
value={selectedMenu.order_number === 0 ? '' : selectedMenu.order_number}
onChange={(e) => {
const value = parseInt(e.target.value, 10);
setSelectedMenu({
...selectedMenu,
order_number: isNaN(value) ? 0 : value
});
}}
<NumericFormat
className={`input ${errors.order_number ? 'border-red-500' : ''}`}
value={selectedMenu.order_number}
allowNegative={false}
onValueChange={(e) =>
setSelectedMenu({ ...selectedMenu, order_number: e.floatValue ?? null })
}
/>
</div>
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">Icon</label>
<Input
className="input"
@ -215,18 +188,19 @@ const EditDialog = () => {
onChange={(e) => setSelectedMenu({ ...selectedMenu, icon: e.target.value })}
/>
</div>
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">
Status<span className="text-red-500">*</span>
</label>
<Select
value={selectedMenu.status}
onValueChange={(value) => setSelectedMenu({ ...selectedMenu, status: value })}
onValueChange={(value) => {
setSelectedMenu({ ...selectedMenu, status: value });
setErrors({ ...errors, status: '' });
}}
>
<SelectTrigger>
<SelectTrigger className={errors.status ? 'border-red-500' : ''}>
<SelectValue placeholder="Select Status" />
</SelectTrigger>
<SelectContent>
@ -234,7 +208,9 @@ const EditDialog = () => {
<SelectItem value="N">Inactive</SelectItem>
</SelectContent>
</Select>
</div>
{errors.status && (
<span className="text-red-500 text-xs mt-1">{errors.status}</span>
)}
</div>
{/* <div className="w-full">

49
src/pages/menu/manage-menu/blocks/Types.ts Normal file
View File

@ -0,0 +1,49 @@
import { toast } from 'sonner';
export const initialStateMenu: {
module: string;
name: string;
link: string;
id_parent: string;
order_number: string | number | null;
icon: string;
status: string;
} = {
module: '',
name: '',
link: '',
id_parent: '',
order_number: null,
icon: '',
status: ''
};
export const validateFormsMenu = (
formField: typeof initialStateMenu,
setErrors: React.Dispatch<React.SetStateAction<Record<string, string>>>
) => {
const requiredFields = [
{ key: 'module', label: 'Module' },
{ key: 'name', label: 'Name' },
{ key: 'link', label: 'Link' },
{ key: 'status', label: 'Status' }
];
const newErrors: Record<string, string> = {};
let isValid = true;
requiredFields.forEach(({ key, label }) => {
if (
formField[key as keyof typeof formField] === '' ||
formField[key as keyof typeof formField] === null ||
formField[key as keyof typeof formField] === undefined
) {
newErrors[key] = `${label} is required`;
toast.error(`${label} is required`);
isValid = false;
}
});
setErrors(newErrors);
return isValid;
};