Merge pull request 'lavoce' (#50) from lavoce into main

Reviewed-on: #50
This commit is contained in:
2026-06-05 08:09:27 +00:00

View File

@@ -13,6 +13,7 @@ const DetailContact = memo(function DetailContact(props) {
id: '', id: '',
name: '', name: '',
phone: '', phone: '',
email: '',
is_active: true, is_active: true,
}; };
@@ -34,6 +35,22 @@ const DetailContact = memo(function DetailContact(props) {
[name]: value, [name]: value,
})); }));
} }
// if (name === 'email') {
// const email = value.trim();
// setFormData((prev) => ({
// ...prev,
// [name]: email,
// }));
// setErrors((prev) => ({
// ...prev,
// email:
// email && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)
// ? 'Format email tidak valid'
// : '',
// }));
// }
}; };
@@ -51,6 +68,7 @@ const DetailContact = memo(function DetailContact(props) {
const validationRules = [ const validationRules = [
{ field: 'name', label: 'Contact Name', required: true }, { field: 'name', label: 'Contact Name', required: true },
{ field: 'phone', label: 'Phone', required: true }, { field: 'phone', label: 'Phone', required: true },
{ field: 'email', label: 'Email', required: false },
]; ];
if ( if (
@@ -84,10 +102,23 @@ const DetailContact = memo(function DetailContact(props) {
return; return;
} }
// Validasi Email
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
if (formData.email && !emailRegex.test(formData.email.trim())) {
NotifOk({
icon: 'warning',
title: 'Peringatan',
message: 'Format email tidak valid.',
});
setConfirmLoading(false);
return;
}
try { try {
const contactData = { const contactData = {
contact_name: formData.name, contact_name: formData.name,
contact_phone: formData.phone.replace(/[\s\-\(\)]/g, ''), // Clean phone number contact_phone: formData.phone.replace(/[\s\-\(\)]/g, ''), // Clean phone number
// contact_email: formData.email?.trim(),
is_active: formData.is_active, is_active: formData.is_active,
}; };
@@ -134,6 +165,7 @@ const DetailContact = memo(function DetailContact(props) {
setFormData({ setFormData({
name: props.selectedData.contact_name || props.selectedData.name, name: props.selectedData.contact_name || props.selectedData.name,
phone: props.selectedData.contact_phone || props.selectedData.phone, phone: props.selectedData.contact_phone || props.selectedData.phone,
email: props.selectedData.contact_email || props.selectedData.email,
is_active: is_active:
props.selectedData.is_active || props.selectedData.status === 'active', props.selectedData.is_active || props.selectedData.status === 'active',
}); });
@@ -141,6 +173,7 @@ const DetailContact = memo(function DetailContact(props) {
setFormData({ setFormData({
name: '', name: '',
phone: '', phone: '',
email: '',
is_active: true, is_active: true,
}); });
} }
@@ -249,6 +282,19 @@ const DetailContact = memo(function DetailContact(props) {
style={{ color: formData.is_active ? '#000000' : '#ff4d4f' }} style={{ color: formData.is_active ? '#000000' : '#ff4d4f' }}
/> />
</div> </div>
<div style={{ marginBottom: 12 }}>
<Text strong>Email</Text>
{/* <Text style={{ color: 'red' }}> *</Text> */}
<Input
name="email"
value={formData.email}
onChange={handleInputChange}
placeholder="Enter Email Number"
readOnly={props.readOnly}
maxLength={15}
style={{ color: formData.is_active ? '#000000' : '#ff4d4f' }}
/>
</div>
{/* Contact Type */} {/* Contact Type */}
{/* <div style={{ marginBottom: 12 }}> {/* <div style={{ marginBottom: 12 }}>
<Text strong>Contact Type</Text> <Text strong>Contact Type</Text>