- {/* Garis vertikal yang menyambung */}
-
+
+
+ {/* Garis vertikal yang menyambung */}
+
- {logHistoryData.map((log, index) => (
-
- {/* Kolom Kiri: Branch/Timeline */}
- (
+
-
-
+ >
+
+
- {/* Kolom Kanan: Card */}
-
-
-
-
-
-
-
-
- Added at {log.timestamp}
-
+ {/* Kolom Kanan: Card */}
+
+
+
+
+
+
+
+
+ Added at {log.timestamp}
+
+
+
+ Added by: {log.addedBy.name}
+
+ {log.addedBy.phone}
+
+
-
- Added by: {log.addedBy.name}
-
- {log.addedBy.phone}
-
-
-
-
-
-
- {log.description}
-
-
-
-
-
-
- ))}
+
+
+
+ {log.description}
+
+
+
+
+
+
+ ))}
+
)}
diff --git a/src/pages/notificationDetail/IndexNotificationDetail.jsx b/src/pages/notificationDetail/IndexNotificationDetail.jsx
index 1a43f09..a3eb466 100644
--- a/src/pages/notificationDetail/IndexNotificationDetail.jsx
+++ b/src/pages/notificationDetail/IndexNotificationDetail.jsx
@@ -38,6 +38,7 @@ import {
getNotificationDetail,
createNotificationLog,
getNotificationLogByNotificationId,
+ resendNotificationToUser,
} from '../../api/notification';
const { Content } = Layout;
@@ -94,38 +95,21 @@ const transformNotificationData = (apiData) => {
device_location: apiData.device_location,
brand_name: apiData.brand_name,
},
+ users: apiData.users || [],
};
};
-// Dummy data baru untuk user history
-const getDummyUsers = (notification) => {
- if (!notification) return [];
- return [
- {
- id: '1',
- name: 'John Doe',
- phone: '081234567890',
- status: 'delivered',
- },
- {
- id: '2',
- name: 'Jane Smith',
- phone: '082345678901',
- status: 'sent',
- },
- {
- id: '3',
- name: 'Bob Johnson',
- phone: '083456789012',
- status: 'failed',
- },
- {
- id: '4',
- name: 'Alice Brown',
- phone: '084567890123',
- status: 'delivered',
- },
- ];
+// Function to get actual users from notification data
+const getUsersFromNotification = (notification) => {
+ if (!notification || !notification.users) return [];
+
+ return notification.users.map((user) => ({
+ id: user.notification_error_user_id.toString(),
+ name: user.contact_name,
+ phone: user.contact_phone,
+ status: user.is_send ? 'sent' : 'pending',
+ loading: user.loading || false,
+ }));
};
const getStatusTag = (status) => {
@@ -469,7 +453,7 @@ const NotificationDetailTab = (props) => {
size={2}
style={{ width: '100%' }}
>
- {getDummyUsers(notification).map((user) => (
+ {getUsersFromNotification(notification).map((user) => (
{
type="primary"
icon={}
size="small"
- onClick={(e) => {
+ loading={user.loading}
+ onClick={async (e) => {
e.stopPropagation();
- console.log(
- `Resend to ${user.name}`
- );
+ const userId = parseInt(user.id);
+ try {
+ // Update user status to show loading
+ const updatedUsers = notification.users.map(u =>
+ u.notification_error_user_id === userId
+ ? { ...u, loading: true }
+ : u
+ );
+ setNotification({
+ ...notification,
+ users: updatedUsers
+ });
+
+ // Call the resend API
+ const response = await resendNotificationToUser(
+ notification.notification_error_id,
+ userId
+ );
+
+ if (response && response.statusCode === 200) {
+ message.success(`Notification resent to ${user.name}`);
+
+ // Update user status
+ const updatedUsersAfterSuccess = notification.users.map(u =>
+ u.notification_error_user_id === userId
+ ? {
+ ...u,
+ is_send: true,
+ status: 'sent',
+ loading: false
+ }
+ : { ...u, loading: false }
+ );
+ setNotification({
+ ...notification,
+ users: updatedUsersAfterSuccess
+ });
+ } else {
+ throw new Error(response?.message || 'Failed to resend notification');
+ }
+ } catch (error) {
+ console.error('Error resending notification:', error);
+ message.error(error.message || 'Failed to resend notification');
+
+ // Reset loading state
+ const resetUsers = notification.users.map(u =>
+ u.notification_error_user_id === userId
+ ? { ...u, loading: false }
+ : u
+ );
+ setNotification({
+ ...notification,
+ users: resetUsers
+ });
+ }
}}
>
Resend
diff --git a/src/pages/user/component/ChangePasswordModal.jsx b/src/pages/user/component/ChangePasswordModal.jsx
index 826359b..28ccff1 100644
--- a/src/pages/user/component/ChangePasswordModal.jsx
+++ b/src/pages/user/component/ChangePasswordModal.jsx
@@ -115,7 +115,7 @@ const ChangePasswordModal = (props) => {
try {
const response = await changePassword(props.selectedUser.user_id, formData.newPassword);
- console.log('Change Password Response:', response);
+ // console.log('Change Password Response:', response);
if (response && response.statusCode === 200) {
NotifOk({
diff --git a/src/pages/user/component/DetailUser.jsx b/src/pages/user/component/DetailUser.jsx
index 1304fae..c58db9b 100644
--- a/src/pages/user/component/DetailUser.jsx
+++ b/src/pages/user/component/DetailUser.jsx
@@ -220,35 +220,27 @@ const DetailUser = (props) => {
// For update mode: only send email if it has changed
if (FormData.user_id) {
- // Only include email if it has changed from original
if (FormData.user_email !== originalEmail) {
payload.user_email = FormData.user_email;
}
- // Add is_active for update mode
+
payload.is_active = FormData.is_active;
} else {
- // For create mode: always send email
payload.user_email = FormData.user_email;
}
- // Only add role_id if it exists (backend requires number >= 1, no null)
if (FormData.role_id) {
payload.role_id = FormData.role_id;
}
// Add password and name for new user (create mode)
if (!FormData.user_id) {
- payload.user_name = FormData.user_name; // Username only for create
- payload.user_password = FormData.password; // Backend expects 'user_password'
- // Don't send confirmPassword, is_sa for create
+ payload.user_name = FormData.user_name;
+ payload.user_password = FormData.password;
}
- // For update mode:
- // - Don't send 'user_name' (username is immutable)
- // - is_active is now sent for update mode
- // - Only send email if it has changed
try {
- console.log('Payload being sent:', payload);
+ // console.log('Payload being sent:', payload);
let response;
if (!FormData.user_id) {
@@ -257,11 +249,10 @@ const DetailUser = (props) => {
response = await updateUser(FormData.user_id, payload);
}
- console.log('Save User Response:', response);
+ // console.log('Save User Response:', response);
// Check if response is successful
if (response && (response.statusCode === 200 || response.statusCode === 201)) {
- // If in edit mode and newPassword is provided, change password
if (FormData.user_id && FormData.newPassword) {
try {
const passwordResponse = await changePassword(
@@ -385,9 +376,9 @@ const DetailUser = (props) => {
search: '',
});
- console.log('Fetching roles with params:', queryParams.toString());
+ // console.log('Fetching roles with params:', queryParams.toString());
const response = await getAllRole(queryParams);
- console.log('Fetched roles response:', response);
+ // console.log('Fetched roles response:', response);
// Handle different response structures
if (response && response.data) {
@@ -408,7 +399,7 @@ const DetailUser = (props) => {
}
setRoleList(roles);
- console.log('Setting role list:', roles);
+ // console.log('Setting role list:', roles);
} else {
// Add mock data as fallback
console.warn('No response data, using mock data');
@@ -418,7 +409,7 @@ const DetailUser = (props) => {
{ role_id: 3, role_name: 'User', role_level: 3 },
];
setRoleList(mockRoles);
- console.log('Setting mock role list:', mockRoles);
+ // console.log('Setting mock role list:', mockRoles);
}
} catch (error) {
console.error('Error fetching roles:', error);
@@ -429,7 +420,7 @@ const DetailUser = (props) => {
{ role_id: 3, role_name: 'User', role_level: 3 },
];
setRoleList(mockRoles);
- console.log('Setting mock role list due to error:', mockRoles);
+ // console.log('Setting mock role list due to error:', mockRoles);
// Only show error notification if we don't have fallback data
if (process.env.NODE_ENV === 'development') {
@@ -1146,9 +1137,7 @@ const DetailUser = (props) => {
))}
{errors.role_id && (
-
- {errors.role_id}
-
+ {errors.role_id}
)}