yogiedigital/cod-fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: yogiedigital:d03bbf2a418e9bf65f61a9cbcfc81b4e5685b0a3
Branches Tags
yogiedigital:main yogiedigital:lavoce
...
compare: yogiedigital:lavoce
Branches Tags
yogiedigital:lavoce yogiedigital:main

23 Commits
d03bbf2a41 ... lavoce

Author SHA1 Message Date
zain94rif
c2163cec5e Merge branch 'lavoce' of https://gitea.idetama.id/yogiedigital/cod-fe into lavoce 2026-01-08 17:25:23 +07:00
zain94rif
d5866ceae4 fix(api): search use api 2026-01-08 17:25:17 +07:00
Fachba
6fdb259246 fixing validate solution optional in brand error code 2026-01-08 14:32:27 +07:00
Fachba
0aad43c751 add label error code in list notification 2026-01-08 14:24:32 +07:00
Fachba
d988d47e30 fixing layout mobile detail notification 2026-01-08 14:17:38 +07:00
zain94rif
e08eaaa43e fix(text): add 'error code' & move solution name 2026-01-08 13:55:01 +07:00
zain94rif
f6ca54f5b4 Merge branch 'lavoce' of https://gitea.idetama.id/yogiedigital/cod-fe into lavoce 2026-01-08 13:07:27 +07:00
zain94rif
a9b8053bd8 fix: change message 'Setiap error code harus memiliki minimal 1 solution!' disabled 2026-01-08 13:07:21 +07:00
Fachba
600c101c68 fixing typo detail notification user 2026-01-08 12:17:13 +07:00
zain94rif
14a6884f43 Merge branch 'lavoce' of https://gitea.idetama.id/yogiedigital/cod-fe into lavoce 2026-01-07 17:07:46 +07:00
zain94rif
8e151ffe0b fix(comp): modified the card in notification detail 2026-01-07 17:07:42 +07:00
Fachba
8f64843613 fixing redirect wa session token 2026-01-07 16:10:23 +07:00
zain94rif
fe8f6d1002 fix: move update is read's api after fetchLogHistory 2026-01-07 14:40:36 +07:00
zain94rif
5281e288a9 feat(var): add update at from create at 2026-01-07 11:00:35 +07:00
zain94rif
4ed05cc640 fix: resize add log card 2026-01-07 10:30:03 +07:00
zain94rif
14e97fead2 feat(api): add update is_read for detail 2026-01-06 16:12:58 +07:00
zain94rif
0935d7c9f5 fix(var): use notification_error_id from item, not from users 2026-01-06 09:53:15 +07:00
zain94rif
3266641f81 fix(api): fixing put to post 2026-01-05 14:48:46 +07:00
zain94rif
739c55c0bc fix(api): fixing endpoint notification 2026-01-05 14:26:12 +07:00
zain94rif
5b4485d20d feat(api): add API for resend chat user 2026-01-05 14:08:02 +07:00
Bragas Rexita Ecos Fernanda
98057beb0f Merge pull request 'fix-lav-notification' (#31) from fix-lav-notification into lavoce 
Reviewed-on: #31
 2026-01-05 03:40:24 +00:00
zain94rif
b342289888 fix(view): adjustment view page notification 2026-01-05 10:39:01 +07:00
zain94rif
ec094b8f55 fix(text): change 'User History' to 'History User' 2026-01-05 09:38:27 +07:00
8 changed files with 878 additions and 683 deletions
Expand all files Collapse all files

40
src/api/notification.jsx
View File

@@ -46,6 +46,15 @@ const getNotificationLogByNotificationId = async (notificationId) => {
return response.data; return response.data;
}; };
// update is_read status
const updateIsRead = async (notificationId) => {
const response = await SendRequest({
method: 'put',
prefix: `notification/${notificationId}`,
});
return response.data;
};
// Resend notification to specific user // Resend notification to specific user
const resendNotificationToUser = async (notificationId, userId) => { const resendNotificationToUser = async (notificationId, userId) => {
const response = await SendRequest({ const response = await SendRequest({
@@ -55,11 +64,42 @@ const resendNotificationToUser = async (notificationId, userId) => {
return response.data; return response.data;
}; };
// Resend Chat by User
const resendChatByUser = async (notificationId, userPhone) => {
const response = await SendRequest({
method: 'post',
prefix: `notification-user/resend/${notificationId}/${userPhone}`,
});
return response.data;
};
// Resend Chat All User
const resendChatAllUser = async (notificationId) => {
const response = await SendRequest({
method: 'post',
prefix: `notification/resend/${notificationId}`,
});
return response.data;
};
// Searching
const searchData = async (queryParams) => {
const response = await SendRequest({
method: 'get',
prefix: `notification?criteria=${queryParams}`,
});
return response.data;
};
export { export {
getAllNotification, getAllNotification,
getNotificationById, getNotificationById,
getNotificationDetail, getNotificationDetail,
createNotificationLog, createNotificationLog,
getNotificationLogByNotificationId, getNotificationLogByNotificationId,
updateIsRead,
resendNotificationToUser, resendNotificationToUser,
resendChatByUser,
resendChatAllUser,
searchData,
}; };

2
src/pages/blank/RedirectWa.jsx
View File

@@ -26,7 +26,7 @@ export default function RedirectWa() {
console.log('tes', response); console.log('tes', response);
const tokenResult = JSON.stringify(response.data?.accessToken); const tokenResult = JSON.stringify(response.data?.data?.accessToken);
sessionStorage.setItem('token_redirect', tokenResult); sessionStorage.setItem('token_redirect', tokenResult);
response.data.auth = true; response.data.auth = true;

435
src/pages/master/brandDevice/AddBrandDevice.jsx
View File

@@ -13,13 +13,18 @@ import {
Space, Space,
ConfigProvider, ConfigProvider,
} from 'antd'; } from 'antd';
import { import { EditOutlined, DeleteOutlined } from '@ant-design/icons';
EditOutlined,
DeleteOutlined
} from '@ant-design/icons';
import { NotifAlert, NotifOk, NotifConfirmDialog } from '../../../components/Global/ToastNotif'; import { NotifAlert, NotifOk, NotifConfirmDialog } from '../../../components/Global/ToastNotif';
import { useBreadcrumb } from '../../../layout/LayoutBreadcrumb'; import { useBreadcrumb } from '../../../layout/LayoutBreadcrumb';
import { getBrandById, createBrand, createErrorCode, getErrorCodesByBrandId, updateErrorCode, deleteErrorCode, deleteBrand } from '../../../api/master-brand'; import {
getBrandById,
createBrand,
createErrorCode,
getErrorCodesByBrandId,
updateErrorCode,
deleteErrorCode,
deleteBrand,
} from '../../../api/master-brand';
import BrandForm from './component/BrandForm'; import BrandForm from './component/BrandForm';
import ErrorCodeForm from './component/ErrorCodeForm'; import ErrorCodeForm from './component/ErrorCodeForm';
import SolutionForm from './component/SolutionForm'; import SolutionForm from './component/SolutionForm';
@@ -42,7 +47,9 @@ const AddBrandDevice = () => {
const [selectedSparepartIds, setSelectedSparepartIds] = useState([]); const [selectedSparepartIds, setSelectedSparepartIds] = useState([]);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const tab = searchParams.get('tab'); const tab = searchParams.get('tab');
const [currentStep, setCurrentStep] = useState(tab === 'error-codes' ? 1 : (location.state?.phase || 0)); const [currentStep, setCurrentStep] = useState(
tab === 'error-codes' ? 1 : location.state?.phase || 0
);
const [editingErrorCodeKey, setEditingErrorCodeKey] = useState(null); const [editingErrorCodeKey, setEditingErrorCodeKey] = useState(null);
const [isErrorCodeFormReadOnly, setIsErrorCodeFormReadOnly] = useState(false); const [isErrorCodeFormReadOnly, setIsErrorCodeFormReadOnly] = useState(false);
const [searchText, setSearchText] = useState(''); const [searchText, setSearchText] = useState('');
@@ -68,7 +75,7 @@ const AddBrandDevice = () => {
const values = solutionForm.getFieldsValue(true); const values = solutionForm.getFieldsValue(true);
const solutions = []; const solutions = [];
solutionFields.forEach(fieldKey => { solutionFields.forEach((fieldKey) => {
let solution = null; let solution = null;
if (values.solution_items && values.solution_items[fieldKey]) { if (values.solution_items && values.solution_items[fieldKey]) {
@@ -85,9 +92,16 @@ const AddBrandDevice = () => {
if (solutionType === 'text') { if (solutionType === 'text') {
isValid = solution.text && solution.text.trim() !== ''; isValid = solution.text && solution.text.trim() !== '';
} else if (solutionType === 'file') { } else if (solutionType === 'file') {
const hasPathSolution = solution.path_solution && solution.path_solution.trim() !== ''; const hasPathSolution =
const hasFileUpload = (solution.fileUpload && typeof solution.fileUpload === 'object' && Object.keys(solution.fileUpload).length > 0); solution.path_solution && solution.path_solution.trim() !== '';
const hasFile = (solution.file && typeof solution.file === 'object' && Object.keys(solution.file).length > 0); const hasFileUpload =
solution.fileUpload &&
typeof solution.fileUpload === 'object' &&
Object.keys(solution.fileUpload).length > 0;
const hasFile =
solution.file &&
typeof solution.file === 'object' &&
Object.keys(solution.file).length > 0;
isValid = hasPathSolution || hasFileUpload || hasFile; isValid = hasPathSolution || hasFileUpload || hasFile;
} }
@@ -118,9 +132,9 @@ const AddBrandDevice = () => {
text: '', text: '',
status: true, status: true,
file: null, file: null,
fileUpload: null fileUpload: null,
} },
} },
}); });
}, 100); }, 100);
} }
@@ -128,7 +142,6 @@ const AddBrandDevice = () => {
}; };
const setSolutionsForExistingRecord = (solutions, targetForm) => { const setSolutionsForExistingRecord = (solutions, targetForm) => {
if (!targetForm || !solutions || solutions.length === 0) { if (!targetForm || !solutions || solutions.length === 0) {
return; return;
} }
@@ -153,11 +166,14 @@ const AddBrandDevice = () => {
fileObject = { fileObject = {
uploadPath: solution.path_solution || solution.path_document, uploadPath: solution.path_solution || solution.path_document,
path_solution: solution.path_solution || solution.path_document, path_solution: solution.path_solution || solution.path_document,
name: solution.file_upload_name || (solution.path_solution || solution.path_document).split('/').pop() || 'File', name:
solution.file_upload_name ||
(solution.path_solution || solution.path_document).split('/').pop() ||
'File',
type_solution: solution.type_solution, type_solution: solution.type_solution,
isExisting: true, isExisting: true,
size: 0, size: 0,
url: solution.path_solution || solution.path_document url: solution.path_solution || solution.path_document,
}; };
} }
@@ -170,7 +186,7 @@ const AddBrandDevice = () => {
file: fileObject, file: fileObject,
fileUpload: fileObject, fileUpload: fileObject,
path_solution: solution.path_solution || solution.path_document || null, path_solution: solution.path_solution || solution.path_document || null,
fileName: solution.file_upload_name || null fileName: solution.file_upload_name || null,
}; };
}); });
@@ -180,28 +196,35 @@ const AddBrandDevice = () => {
setSolutionStatuses(newSolutionStatuses); setSolutionStatuses(newSolutionStatuses);
targetForm.resetFields(); targetForm.resetFields();
setTimeout(() => { setTimeout(() => {
targetForm.setFieldsValue({ targetForm.setFieldsValue({
solution_items: solutionItems solution_items: solutionItems,
}); });
setTimeout(() => { setTimeout(() => {
Object.keys(solutionItems).forEach(key => { Object.keys(solutionItems).forEach((key) => {
const solution = solutionItems[key]; const solution = solutionItems[key];
targetForm.setFieldValue(['solution_items', key, 'name'], solution.name); targetForm.setFieldValue(['solution_items', key, 'name'], solution.name);
targetForm.setFieldValue(['solution_items', key, 'type'], solution.type); targetForm.setFieldValue(['solution_items', key, 'type'], solution.type);
targetForm.setFieldValue(['solution_items', key, 'text'], solution.text); targetForm.setFieldValue(['solution_items', key, 'text'], solution.text);
targetForm.setFieldValue(['solution_items', key, 'file'], solution.file); targetForm.setFieldValue(['solution_items', key, 'file'], solution.file);
targetForm.setFieldValue(['solution_items', key, 'fileUpload'], solution.fileUpload); targetForm.setFieldValue(
['solution_items', key, 'fileUpload'],
solution.fileUpload
);
targetForm.setFieldValue(['solution_items', key, 'status'], solution.status); targetForm.setFieldValue(['solution_items', key, 'status'], solution.status);
targetForm.setFieldValue(['solution_items', key, 'path_solution'], solution.path_solution); targetForm.setFieldValue(
targetForm.setFieldValue(['solution_items', key, 'fileName'], solution.fileName); ['solution_items', key, 'path_solution'],
solution.path_solution
);
targetForm.setFieldValue(
['solution_items', key, 'fileName'],
solution.fileName
);
}); });
const finalValues = targetForm.getFieldsValue(); const finalValues = targetForm.getFieldsValue();
}, 100); }, 100);
}, 100); }, 100);
@@ -209,14 +232,14 @@ const AddBrandDevice = () => {
const handleAddSolutionField = () => { const handleAddSolutionField = () => {
const newKey = Math.max(...solutionFields, 0) + 1; const newKey = Math.max(...solutionFields, 0) + 1;
setSolutionFields(prev => [...prev, newKey]); setSolutionFields((prev) => [...prev, newKey]);
setSolutionTypes(prev => ({ ...prev, [newKey]: 'text' })); setSolutionTypes((prev) => ({ ...prev, [newKey]: 'text' }));
setSolutionStatuses(prev => ({ ...prev, [newKey]: true })); setSolutionStatuses((prev) => ({ ...prev, [newKey]: true }));
}; };
const handleRemoveSolutionField = (fieldKey) => { const handleRemoveSolutionField = (fieldKey) => {
if (solutionFields.length > 1) { if (solutionFields.length > 1) {
setSolutionFields(prev => prev.filter(key => key !== fieldKey)); setSolutionFields((prev) => prev.filter((key) => key !== fieldKey));
const newTypes = { ...solutionTypes }; const newTypes = { ...solutionTypes };
const newStatuses = { ...solutionStatuses }; const newStatuses = { ...solutionStatuses };
delete newTypes[fieldKey]; delete newTypes[fieldKey];
@@ -233,7 +256,7 @@ const AddBrandDevice = () => {
}; };
const handleSolutionTypeChange = (fieldKey, type) => { const handleSolutionTypeChange = (fieldKey, type) => {
setSolutionTypes(prev => ({ ...prev, [fieldKey]: type })); setSolutionTypes((prev) => ({ ...prev, [fieldKey]: type }));
if (type === 'file') { if (type === 'file') {
solutionForm.setFieldValue(['solution_items', fieldKey, 'text'], ''); solutionForm.setFieldValue(['solution_items', fieldKey, 'text'], '');
@@ -246,7 +269,7 @@ const AddBrandDevice = () => {
}; };
const handleSolutionStatusChange = (fieldKey, status) => { const handleSolutionStatusChange = (fieldKey, status) => {
setSolutionStatuses(prev => ({ ...prev, [fieldKey]: status })); setSolutionStatuses((prev) => ({ ...prev, [fieldKey]: status }));
}; };
const handleNextStep = async () => { const handleNextStep = async () => {
@@ -259,7 +282,7 @@ const AddBrandDevice = () => {
brand_type: brandValues.brand_type || '', brand_type: brandValues.brand_type || '',
brand_manufacture: brandValues.brand_manufacture || '', brand_manufacture: brandValues.brand_manufacture || '',
brand_model: brandValues.brand_model || '', brand_model: brandValues.brand_model || '',
is_active: brandValues.is_active !== undefined ? brandValues.is_active : true is_active: brandValues.is_active !== undefined ? brandValues.is_active : true,
}; };
const response = await createBrand(brandApiData); const response = await createBrand(brandApiData);
@@ -268,7 +291,7 @@ const AddBrandDevice = () => {
const newBrandInfo = { const newBrandInfo = {
...brandValues, ...brandValues,
brand_id: response.data.brand_id, brand_id: response.data.brand_id,
brand_code: response.data.brand_code brand_code: response.data.brand_code,
}; };
setBrandInfo(newBrandInfo); setBrandInfo(newBrandInfo);
setTemporaryBrandId(response.data.brand_id); setTemporaryBrandId(response.data.brand_id);
@@ -307,8 +330,7 @@ const AddBrandDevice = () => {
if (isTemporaryBrand && temporaryBrandId) { if (isTemporaryBrand && temporaryBrandId) {
try { try {
await deleteBrand(temporaryBrandId); await deleteBrand(temporaryBrandId);
} catch (error) { } catch (error) {}
}
} }
navigate('/master/brand-device'); navigate('/master/brand-device');
}; };
@@ -360,8 +382,6 @@ const AddBrandDevice = () => {
setTrigerFilter((prev) => !prev); setTrigerFilter((prev) => !prev);
}; };
const resetErrorCodeForm = () => { const resetErrorCodeForm = () => {
errorCodeForm.resetFields(); errorCodeForm.resetFields();
errorCodeForm.setFieldsValue({ errorCodeForm.setFieldsValue({
@@ -391,16 +411,16 @@ const AddBrandDevice = () => {
return; return;
} }
if (!solutionData || solutionData.length === 0) { // if (!solutionData || solutionData.length === 0) {
NotifAlert({ // NotifAlert({
icon: 'warning', // icon: 'warning',
title: 'Perhatian', // title: 'Perhatian',
message: 'Setiap error code harus memiliki minimal 1 solution!', // message: 'Setiap error code harus memiliki minimal 1 solution!',
}); // });
return; // return;
} // }
const formattedSolutions = solutionData.map(solution => { const formattedSolutions = solutionData.map((solution) => {
const solutionType = solution.type || 'text'; const solutionType = solution.type || 'text';
let typeSolution = solutionType === 'text' ? 'text' : 'image'; let typeSolution = solutionType === 'text' ? 'text' : 'image';
@@ -422,7 +442,11 @@ const AddBrandDevice = () => {
} else { } else {
formattedSolution.text_solution = ''; formattedSolution.text_solution = '';
formattedSolution.path_solution = solution.path_solution || solution.file?.uploadPath || solution.fileUpload?.uploadPath || ''; formattedSolution.path_solution =
solution.path_solution ||
solution.file?.uploadPath ||
solution.fileUpload?.uploadPath ||
'';
} }
if (formattedSolution.brand_code_solution_id) { if (formattedSolution.brand_code_solution_id) {
@@ -440,7 +464,7 @@ const AddBrandDevice = () => {
path_icon: errorCodeIcon?.uploadPath || '', path_icon: errorCodeIcon?.uploadPath || '',
is_active: errorCodeValues.status === undefined ? true : errorCodeValues.status, is_active: errorCodeValues.status === undefined ? true : errorCodeValues.status,
solution: formattedSolutions, solution: formattedSolutions,
spareparts: selectedSparepartIds || [] spareparts: selectedSparepartIds || [],
}; };
let response; let response;
@@ -456,11 +480,13 @@ const AddBrandDevice = () => {
NotifOk({ NotifOk({
icon: 'success', icon: 'success',
title: 'Berhasil', title: 'Berhasil',
message: editingErrorCodeKey ? 'Error code berhasil diupdate!' : 'Error code berhasil ditambahkan!', message: editingErrorCodeKey
? 'Error code berhasil diupdate!'
: 'Error code berhasil ditambahkan!',
}); });
resetErrorCodeForm(); resetErrorCodeForm();
setTrigerFilter(prev => !prev); setTrigerFilter((prev) => !prev);
} else { } else {
NotifAlert({ NotifAlert({
icon: 'error', icon: 'error',
@@ -479,12 +505,10 @@ const AddBrandDevice = () => {
} }
}; };
const handleErrorCodeIconRemove = () => { const handleErrorCodeIconRemove = () => {
setErrorCodeIcon(null); setErrorCodeIcon(null);
}; };
const handleFinish = async () => { const handleFinish = async () => {
setConfirmLoading(true); setConfirmLoading(true);
try { try {
@@ -506,10 +530,10 @@ const AddBrandDevice = () => {
const response = await getErrorCodesByBrandId(brandInfo.brand_id, queryParams); const response = await getErrorCodesByBrandId(brandInfo.brand_id, queryParams);
if (response && response.statusCode === 200 && response.data) { if (response && response.statusCode === 200 && response.data) {
const freshErrorCodes = response.data.map(ec => ({ const freshErrorCodes = response.data.map((ec) => ({
...ec, ...ec,
tempId: `existing_${ec.error_code_id}`, tempId: `existing_${ec.error_code_id}`,
status: 'existing' status: 'existing',
})); }));
setApiErrorCodes(freshErrorCodes); setApiErrorCodes(freshErrorCodes);
@@ -517,7 +541,8 @@ const AddBrandDevice = () => {
NotifAlert({ NotifAlert({
icon: 'warning', icon: 'warning',
title: 'Perhatian', title: 'Perhatian',
message: 'Harap tambahkan minimal 1 error code sebelum menyelesaikan.', message:
'Harap tambahkan minimal 1 error code sebelum menyelesaikan.',
}); });
return; return;
} }
@@ -526,7 +551,8 @@ const AddBrandDevice = () => {
NotifAlert({ NotifAlert({
icon: 'warning', icon: 'warning',
title: 'Perhatian', title: 'Perhatian',
message: 'Harap tambahkan minimal 1 error code sebelum menyelesaikan.', message:
'Harap tambahkan minimal 1 error code sebelum menyelesaikan.',
}); });
return; return;
} }
@@ -591,11 +617,7 @@ const AddBrandDevice = () => {
<Spin size="large" /> <Spin size="large" />
</div> </div>
)} )}
<BrandForm <BrandForm form={brandForm} isEdit={false} brandInfo={brandInfo} />
form={brandForm}
isEdit={false}
brandInfo={brandInfo}
/>
</div> </div>
); );
} }
@@ -635,31 +657,39 @@ const AddBrandDevice = () => {
</Col> </Col>
<Col xs={24} md={16} lg={16}> <Col xs={24} md={16} lg={16}>
<div style={{ <div
paddingLeft: '12px' style={{
}}> paddingLeft: '12px',
}}
>
<Card <Card
title={ title={
<div style={{ <div
display: 'flex', style={{
alignItems: 'center',
justifyContent: 'space-between',
width: '100%'
}}>
<span style={{
fontSize: '16px',
fontWeight: '600',
color: '#262626',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
gap: '8px' justifyContent: 'space-between',
}}> width: '100%',
<span style={{ }}
width: '4px', >
height: '20px', <span
backgroundColor: '#23A55A', style={{
borderRadius: '2px' fontSize: '16px',
}}></span> fontWeight: '600',
color: '#262626',
display: 'flex',
alignItems: 'center',
gap: '8px',
}}
>
<span
style={{
width: '4px',
height: '20px',
backgroundColor: '#23A55A',
borderRadius: '2px',
}}
></span>
Error Code Form Error Code Form
</span> </span>
<Button <Button
@@ -675,43 +705,51 @@ const AddBrandDevice = () => {
padding: '0 24px', padding: '0 24px',
fontWeight: '500', fontWeight: '500',
boxShadow: '0 2px 4px rgba(35, 165, 90, 0.2)', boxShadow: '0 2px 4px rgba(35, 165, 90, 0.2)',
transition: 'all 0.3s ease' transition: 'all 0.3s ease',
}} }}
onMouseEnter={(e) => { onMouseEnter={(e) => {
e.target.style.boxShadow = '0 4px 8px rgba(35, 165, 90, 0.3)'; e.target.style.boxShadow =
'0 4px 8px rgba(35, 165, 90, 0.3)';
}} }}
onMouseLeave={(e) => { onMouseLeave={(e) => {
e.target.style.boxShadow = '0 2px 4px rgba(35, 165, 90, 0.2)'; e.target.style.boxShadow =
'0 2px 4px rgba(35, 165, 90, 0.2)';
}} }}
> >
{editingErrorCodeKey ? 'Update Error Code' : 'Save Error Code'} {editingErrorCodeKey
? 'Update Error Code'
: 'Save Error Code'}
</Button> </Button>
</div> </div>
} }
style={{ style={{
width: '100%', width: '100%',
boxShadow: '0 2px 8px rgba(0,0,0,0.06)', boxShadow: '0 2px 8px rgba(0,0,0,0.06)',
borderRadius: '12px' borderRadius: '12px',
}} }}
styles={{ styles={{
body: { padding: '16px 24px 12px 24px' }, body: { padding: '16px 24px 12px 24px' },
header: { header: {
padding: '16px 24px', padding: '16px 24px',
borderBottom: '1px solid #f0f0f0', borderBottom: '1px solid #f0f0f0',
backgroundColor: '#fafafa' backgroundColor: '#fafafa',
} },
}} }}
> >
<div style={{ display: 'flex', flexDirection: 'column', gap: '8px' }}> <div
<div style={{ style={{ display: 'flex', flexDirection: 'column', gap: '8px' }}
padding: '16px', >
border: '1px solid #f0f0f0', <div
borderRadius: '10px', style={{
backgroundColor: '#ffffff', padding: '16px',
marginBottom: '0', border: '1px solid #f0f0f0',
transition: 'all 0.3s ease', borderRadius: '10px',
boxShadow: '0 1px 3px rgba(0,0,0,0.04)' backgroundColor: '#ffffff',
}}> marginBottom: '0',
transition: 'all 0.3s ease',
boxShadow: '0 1px 3px rgba(0,0,0,0.04)',
}}
>
<ErrorCodeForm <ErrorCodeForm
errorCodeForm={errorCodeForm} errorCodeForm={errorCodeForm}
isErrorCodeFormReadOnly={isErrorCodeFormReadOnly} isErrorCodeFormReadOnly={isErrorCodeFormReadOnly}
@@ -724,29 +762,42 @@ const AddBrandDevice = () => {
<Row gutter={[20, 0]} style={{ marginTop: '0' }}> <Row gutter={[20, 0]} style={{ marginTop: '0' }}>
<Col xs={24} md={12} lg={12}> <Col xs={24} md={12} lg={12}>
<div style={{ <div
padding: '16px', style={{
border: '1px solid #f0f0f0', padding: '16px',
borderRadius: '10px', border: '1px solid #f0f0f0',
backgroundColor: '#ffffff', borderRadius: '10px',
transition: 'all 0.3s ease', backgroundColor: '#ffffff',
boxShadow: '0 1px 3px rgba(0,0,0,0.04)' transition: 'all 0.3s ease',
}}> boxShadow: '0 1px 3px rgba(0,0,0,0.04)',
<div style={{ }}
display: 'flex', >
alignItems: 'center', <div
gap: '8px', style={{
marginBottom: '12px', display: 'flex',
paddingBottom: '8px', alignItems: 'center',
borderBottom: '1px solid #f5f5f5' gap: '8px',
}}> marginBottom: '12px',
<div style={{ paddingBottom: '8px',
width: '3px', borderBottom: '1px solid #f5f5f5',
height: '16px', }}
backgroundColor: '#1890ff', >
borderRadius: '2px' <div
}}></div> style={{
<h4 style={{ margin: 0, color: '#262626', fontSize: '14px', fontWeight: '600' }}> width: '3px',
height: '16px',
backgroundColor: '#1890ff',
borderRadius: '2px',
}}
></div>
<h4
style={{
margin: 0,
color: '#262626',
fontSize: '14px',
fontWeight: '600',
}}
>
Solution Solution
</h4> </h4>
</div> </div>
@@ -756,14 +807,23 @@ const AddBrandDevice = () => {
solutionTypes={solutionTypes} solutionTypes={solutionTypes}
solutionStatuses={solutionStatuses} solutionStatuses={solutionStatuses}
onAddSolutionField={handleAddSolutionField} onAddSolutionField={handleAddSolutionField}
onRemoveSolutionField={handleRemoveSolutionField} onRemoveSolutionField={
handleRemoveSolutionField
}
onSolutionTypeChange={handleSolutionTypeChange} onSolutionTypeChange={handleSolutionTypeChange}
onSolutionStatusChange={handleSolutionStatusChange} onSolutionStatusChange={
onSolutionFileUpload={(fileData) => { handleSolutionStatusChange
}} }
onSolutionFileUpload={(fileData) => {}}
onFileView={(fileData) => { onFileView={(fileData) => {
if (fileData && (fileData.url || fileData.uploadPath)) { if (
window.open(fileData.url || fileData.uploadPath, '_blank'); fileData &&
(fileData.url || fileData.uploadPath)
) {
window.open(
fileData.url || fileData.uploadPath,
'_blank'
);
} }
}} }}
isReadOnly={false} isReadOnly={false}
@@ -772,40 +832,55 @@ const AddBrandDevice = () => {
</div> </div>
</Col> </Col>
<Col xs={24} md={12} lg={12}> <Col xs={24} md={12} lg={12}>
<div style={{ <div
padding: '16px', style={{
border: '1px solid #f0f0f0', padding: '16px',
borderRadius: '10px', border: '1px solid #f0f0f0',
backgroundColor: '#ffffff', borderRadius: '10px',
transition: 'all 0.3s ease', backgroundColor: '#ffffff',
boxShadow: '0 1px 3px rgba(0,0,0,0.04)' transition: 'all 0.3s ease',
}}> boxShadow: '0 1px 3px rgba(0,0,0,0.04)',
<div style={{ }}
display: 'flex', >
alignItems: 'center', <div
gap: '8px', style={{
marginBottom: '12px', display: 'flex',
paddingBottom: '8px', alignItems: 'center',
borderBottom: '1px solid #f5f5f5' gap: '8px',
}}> marginBottom: '12px',
<div style={{ paddingBottom: '8px',
width: '3px', borderBottom: '1px solid #f5f5f5',
height: '16px', }}
backgroundColor: '#faad14', >
borderRadius: '2px' <div
}}></div> style={{
<h4 style={{ margin: 0, color: '#262626', fontSize: '14px', fontWeight: '600' }}> width: '3px',
height: '16px',
backgroundColor: '#faad14',
borderRadius: '2px',
}}
></div>
<h4
style={{
margin: 0,
color: '#262626',
fontSize: '14px',
fontWeight: '600',
}}
>
Sparepart Selection Sparepart Selection
</h4> </h4>
</div> </div>
<div style={{ <div
maxHeight: '45vh', style={{
overflow: 'auto', maxHeight: '45vh',
border: '1px solid #e8e8e8', overflow: 'auto',
borderRadius: '8px', border: '1px solid #e8e8e8',
padding: '12px', borderRadius: '8px',
backgroundColor: '#fafafa' padding: '12px',
}}> backgroundColor: '#fafafa',
}}
>
<SparepartSelect <SparepartSelect
selectedSparepartIds={selectedSparepartIds} selectedSparepartIds={selectedSparepartIds}
onSparepartChange={setSelectedSparepartIds} onSparepartChange={setSelectedSparepartIds}
@@ -816,15 +891,16 @@ const AddBrandDevice = () => {
</Col> </Col>
</Row> </Row>
<div style={{ <div
display: 'flex', style={{
justifyContent: 'space-between', display: 'flex',
alignItems: 'center', justifyContent: 'space-between',
padding: '16px 0 0 0', alignItems: 'center',
borderTop: '1px solid #f0f0f0', padding: '16px 0 0 0',
marginTop: '12px' borderTop: '1px solid #f0f0f0',
}}> marginTop: '12px',
}}
>
{editingErrorCodeKey && ( {editingErrorCodeKey && (
<Button <Button
size="large" size="large"
@@ -837,7 +913,7 @@ const AddBrandDevice = () => {
height: '40px', height: '40px',
padding: '0 24px', padding: '0 24px',
fontWeight: '500', fontWeight: '500',
transition: 'all 0.3s ease' transition: 'all 0.3s ease',
}} }}
onMouseEnter={(e) => { onMouseEnter={(e) => {
e.target.style.borderColor = '#ff4d4f'; e.target.style.borderColor = '#ff4d4f';
@@ -871,7 +947,7 @@ const AddBrandDevice = () => {
setBreadcrumbItems([ setBreadcrumbItems([
{ {
title: <span style={{ fontSize: '14px', fontWeight: 'bold' }}>• Master</span> title: <span style={{ fontSize: '14px', fontWeight: 'bold' }}>• Master</span>,
}, },
{ {
title: ( title: (
@@ -895,12 +971,11 @@ const AddBrandDevice = () => {
if (location.state?.fromFileViewer && location.state.phase !== undefined) { if (location.state?.fromFileViewer && location.state.phase !== undefined) {
setCurrentStep(location.state.phase); setCurrentStep(location.state.phase);
} }
}, [setBreadcrumbItems, navigate, searchParams, location.state]); }, [setBreadcrumbItems, navigate, searchParams, location.state]);
useEffect(() => { useEffect(() => {
if (brandInfo.brand_id && currentStep === 1) { if (brandInfo.brand_id && currentStep === 1) {
setTrigerFilter(prev => !prev); setTrigerFilter((prev) => !prev);
} }
}, [brandInfo.brand_id, currentStep]); }, [brandInfo.brand_id, currentStep]);
@@ -913,8 +988,7 @@ const AddBrandDevice = () => {
const errorCodes = response.data || []; const errorCodes = response.data || [];
setApiErrorCodes(errorCodes); setApiErrorCodes(errorCodes);
} }
} catch (error) { } catch (error) {}
}
} }
}; };
fetchErrorCodes(); fetchErrorCodes();
@@ -925,8 +999,7 @@ const AddBrandDevice = () => {
if (isTemporaryBrand && temporaryBrandId && currentStep === 0) { if (isTemporaryBrand && temporaryBrandId && currentStep === 0) {
try { try {
await deleteBrand(temporaryBrandId); await deleteBrand(temporaryBrandId);
} catch (error) { } catch (error) {}
}
} }
}; };
@@ -937,7 +1010,6 @@ const AddBrandDevice = () => {
}; };
}, [isTemporaryBrand, temporaryBrandId, currentStep]); }, [isTemporaryBrand, temporaryBrandId, currentStep]);
return ( return (
<ConfigProvider <ConfigProvider
theme={{ theme={{
@@ -988,14 +1060,9 @@ const AddBrandDevice = () => {
<Divider /> <Divider />
<div style={{ display: 'flex', justifyContent: 'space-between' }}> <div style={{ display: 'flex', justifyContent: 'space-between' }}>
<div> <div>
<Button onClick={handleCancel}> <Button onClick={handleCancel}>Cancel</Button>
Cancel
</Button>
{currentStep === 1 && ( {currentStep === 1 && (
<Button <Button onClick={handlePrevStep} style={{ marginLeft: 8 }}>
onClick={handlePrevStep}
style={{ marginLeft: 8 }}
>
Kembali ke Brand Info Kembali ke Brand Info
</Button> </Button>
)} )}
@@ -1034,4 +1101,4 @@ const AddBrandDevice = () => {
); );
}; };
export default AddBrandDevice; export default AddBrandDevice;

16
src/pages/master/brandDevice/EditBrandDevice.jsx
View File

@@ -479,14 +479,14 @@ const EditBrandDevice = () => {
return; return;
} }
if (!solutionData || solutionData.length === 0) { // if (!solutionData || solutionData.length === 0) {
NotifAlert({ // NotifAlert({
icon: 'warning', // icon: 'warning',
title: 'Perhatian', // title: 'Perhatian',
message: 'Setiap error code harus memiliki minimal 1 solution!', // message: 'Setiap error code harus memiliki minimal 1 solution!',
}); // });
return; // return;
} // }
const formattedSolutions = solutionData.map(solution => { const formattedSolutions = solutionData.map(solution => {
const solutionType = solution.type || 'text'; const solutionType = solution.type || 'text';

115
src/pages/notification/component/ListNotification.jsx
View File

@@ -42,6 +42,9 @@ import {
getAllNotification, getAllNotification,
getNotificationLogByNotificationId, getNotificationLogByNotificationId,
getNotificationDetail, getNotificationDetail,
resendChatByUser,
resendChatAllUser,
searchData,
} from '../../../api/notification'; } from '../../../api/notification';
const { Text, Paragraph, Link: AntdLink } = Typography; const { Text, Paragraph, Link: AntdLink } = Typography;
@@ -64,7 +67,8 @@ const transformNotificationData = (apiData) => {
}) + ' WIB' }) + ' WIB'
: 'N/A', : 'N/A',
location: item.plant_sub_section_name || item.device_location || 'Location not specified', location: item.plant_sub_section_name || item.device_location || 'Location not specified',
details: item.message_error_issue || 'No details available', details: item.device_name || '-',
errId: item.notification_error_id || 0,
link: `/verification-sparepart/${item.notification_error_id}`, // Dummy URL untuk verifikasi spare part link: `/verification-sparepart/${item.notification_error_id}`, // Dummy URL untuk verifikasi spare part
subsection: item.plant_sub_section_name || 'N/A', subsection: item.plant_sub_section_name || 'N/A',
isRead: item.is_read, isRead: item.is_read,
@@ -195,9 +199,9 @@ const ListNotification = memo(function ListNotification(props) {
content: `Are you sure you want to resend the notification for "${notification.title}"?`, content: `Are you sure you want to resend the notification for "${notification.title}"?`,
okText: 'Resend', okText: 'Resend',
cancelText: 'Cancel', cancelText: 'Cancel',
onOk() { async onOk() {
console.log('Resending notification:', notification.id); console.log('Resending notification:', notification.id);
await resendChatAllUser(notification.errId);
message.success( message.success(
`Notification for "${notification.title}" has been resent successfully.` `Notification for "${notification.title}" has been resent successfully.`
); );
@@ -216,13 +220,49 @@ const ListNotification = memo(function ListNotification(props) {
); );
}; };
const fetchSearch = async (data) => {
setLoading(true);
try {
const response = await searchData(data);
if (response && response.data) {
const transformedData = transformNotificationData(response.data);
setNotifications(transformedData);
// Update pagination with API response or calculate from data
if (response.paging) {
setPagination({
current_page: response.paging.current_page || page,
current_limit: response.paging.current_limit || limit,
total_limit: response.paging.total_limit || transformedData.length,
total_page:
response.paging.total_page || Math.ceil(transformedData.length / limit),
});
} else {
// Fallback: calculate pagination from data
const totalItems = transformedData.length;
setPagination((prev) => ({
...prev,
current_page: page,
current_limit: limit,
total_limit: totalItems,
total_page: Math.ceil(totalItems / limit),
}));
}
}
} catch (error) {
console.error(error);
} finally {
setLoading(false);
}
};
const handleSearch = () => { const handleSearch = () => {
setSearchTerm(searchValue); fetchSearch(searchValue);
}; };
const handleSearchClear = () => { const handleSearchClear = () => {
setSearchValue(''); setSearchValue('');
setSearchTerm(''); fetchSearch('');
}; };
const getUnreadCount = () => notifications.filter((n) => !n.isRead).length; const getUnreadCount = () => notifications.filter((n) => !n.isRead).length;
@@ -285,14 +325,16 @@ const ListNotification = memo(function ListNotification(props) {
name: user.contact_name, name: user.contact_name,
phone: user.contact_phone, phone: user.contact_phone,
status: user.is_send ? 'Delivered' : 'Pending', status: user.is_send ? 'Delivered' : 'Pending',
timestamp: user.created_at timestamp: user.updated_at
? new Date(user.created_at).toLocaleString('id-ID', { ? new Date(user.updated_at)
day: '2-digit', .toLocaleString('id-ID', {
month: '2-digit', day: '2-digit',
year: 'numeric', month: '2-digit',
hour: '2-digit', year: 'numeric',
minute: '2-digit', hour: '2-digit',
}) + ' WIB' minute: '2-digit',
})
.replace('.', ':') + ' WIB'
: 'N/A', : 'N/A',
})); }));
setUserHistoryData(transformedUsers); setUserHistoryData(transformedUsers);
@@ -379,7 +421,7 @@ const ListNotification = memo(function ListNotification(props) {
<Text strong>{notification.title}</Text> <Text strong>{notification.title}</Text>
<div style={{ marginTop: '4px' }}> <div style={{ marginTop: '4px' }}>
<Text style={{ color }}> <Text style={{ color }}>
{notification.issue} Error Code {notification.issue}
</Text> </Text>
</div> </div>
</div> </div>
@@ -396,7 +438,7 @@ const ListNotification = memo(function ListNotification(props) {
</div> </div>
</Col> </Col>
<Col flex="auto"> <Col flex="auto">
<div {/* <div
style={{ style={{
display: 'flex', display: 'flex',
gap: '8px', gap: '8px',
@@ -419,12 +461,18 @@ const ListNotification = memo(function ListNotification(props) {
> >
{notification.details} {notification.details}
</Paragraph> </Paragraph>
</div> </div> */}
<Space <Space
direction="vertical" direction="vertical"
size={4} size={4}
style={{ fontSize: '13px', color: '#8c8c8c' }} style={{ fontSize: '13px', color: '#8c8c8c' }}
> >
<Space>
<MobileOutlined />
<Text type="secondary">
{notification.details}
</Text>
</Space>
<Space> <Space>
<ClockCircleOutlined /> <ClockCircleOutlined />
<Text type="secondary"> <Text type="secondary">
@@ -438,17 +486,10 @@ const ListNotification = memo(function ListNotification(props) {
</Text> </Text>
</Space> </Space>
<Space> <Space>
<LinkOutlined />
<AntdLink
href={notification.link}
target="_blank"
>
{notification.link}
</AntdLink>
<Button <Button
type="link" type="link"
icon={<SendOutlined />} icon={<SendOutlined />}
style={{ paddingLeft: '8px' }} style={{ paddingLeft: '0px' }}
onClick={(e) => { onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
handleResend(notification); handleResend(notification);
@@ -606,10 +647,8 @@ const ListNotification = memo(function ListNotification(props) {
type="primary" type="primary"
ghost ghost
icon={<SendOutlined />} icon={<SendOutlined />}
onClick={() => { onClick={async () => {
message.info( await resendChatByUser(user.id, user.phone);
'Resend feature is not available yet. This feature is still under development.'
);
}} }}
> >
Resend Resend
@@ -646,7 +685,7 @@ const ListNotification = memo(function ListNotification(props) {
padding: '0 16px', padding: '0 16px',
position: 'relative', position: 'relative',
border: '1px solid #f0f0f0', border: '1px solid #f0f0f0',
borderRadius: '4px' borderRadius: '4px',
}} }}
> >
<div style={{ position: 'relative' }}> <div style={{ position: 'relative' }}>
@@ -695,8 +734,8 @@ const ListNotification = memo(function ListNotification(props) {
{/* Kolom Kanan: Card */} {/* Kolom Kanan: Card */}
<Col flex="auto"> <Col flex="auto">
<Card size="small" style={{ borderColor: '#91d5ff' }}> <Card size="small" style={{ borderColor: '#91d5ff' }}>
<Row gutter={[16, 8]} align="middle"> <Row gutter={[16, 8]} align="top">
<Col xs={24} md={12}> <Col xs={24} md={10}>
<Space direction="vertical" size={4}> <Space direction="vertical" size={4}>
<Space> <Space>
<ClockCircleOutlined /> <ClockCircleOutlined />
@@ -707,11 +746,16 @@ const ListNotification = memo(function ListNotification(props) {
Added at {log.timestamp} Added at {log.timestamp}
</Text> </Text>
</Space> </Space>
<div>
<Text strong>
{log.addedBy.name}
</Text>
</div>
<div> <div>
<Text strong>Added by: {log.addedBy.name}</Text>
<span <span
style={{ style={{
marginLeft: '8px',
border: '1px solid #52c41a', border: '1px solid #52c41a',
color: '#52c41a', color: '#52c41a',
padding: '2px 6px', padding: '2px 6px',
@@ -724,7 +768,8 @@ const ListNotification = memo(function ListNotification(props) {
</div> </div>
</Space> </Space>
</Col> </Col>
<Col xs={24} md={12}> <Col xs={24} md={14}>
<Text strong>Description:</Text>
<Paragraph <Paragraph
style={{ style={{
color: '#595959', color: '#595959',
@@ -1412,7 +1457,7 @@ const ListNotification = memo(function ListNotification(props) {
</div> </div>
) : ( ) : (
<Typography.Title level={4} style={{ margin: 0 }}> <Typography.Title level={4} style={{ margin: 0 }}>
{modalContent === 'user' && 'User History Notification'} {modalContent === 'user' && 'History User Notification'}
{modalContent === 'log' && 'Log History Notification'} {modalContent === 'log' && 'Log History Notification'}
</Typography.Title> </Typography.Title>
)} )}

30
src/pages/notification/component/UserHistoryModal.jsx
View File

@@ -1,6 +1,12 @@
import React from 'react'; import React from 'react';
import { Modal, Typography, Card, Row, Col, Avatar, Tag, Button, Space } from 'antd'; import { Modal, Typography, Card, Row, Col, Avatar, Tag, Button, Space } from 'antd';
import { UserOutlined, PhoneOutlined, CheckCircleOutlined, SyncOutlined, SendOutlined } from '@ant-design/icons'; import {
UserOutlined,
PhoneOutlined,
CheckCircleOutlined,
SyncOutlined,
SendOutlined,
} from '@ant-design/icons';
const { Text } = Typography; const { Text } = Typography;
@@ -41,9 +47,17 @@ const UserHistoryModal = ({ visible, onCancel, notificationData }) => {
const getStatusTag = (status) => { const getStatusTag = (status) => {
switch (status) { switch (status) {
case 'delivered': case 'delivered':
return <Tag icon={<CheckCircleOutlined />} color="success">Delivered</Tag>; return (
<Tag icon={<CheckCircleOutlined />} color="success">
Delivered
</Tag>
);
case 'sent': case 'sent':
return <Tag icon={<SyncOutlined spin />} color="processing">Sent</Tag>; return (
<Tag icon={<SyncOutlined spin />} color="processing">
Sent
</Tag>
);
case 'failed': case 'failed':
return <Tag color="error">Failed</Tag>; return <Tag color="error">Failed</Tag>;
default: default:
@@ -55,7 +69,7 @@ const UserHistoryModal = ({ visible, onCancel, notificationData }) => {
<Modal <Modal
title={ title={
<Text strong style={{ fontSize: '18px' }}> <Text strong style={{ fontSize: '18px' }}>
User History Notification History User Notification
</Text> </Text>
} }
open={visible} open={visible}
@@ -78,7 +92,13 @@ const UserHistoryModal = ({ visible, onCancel, notificationData }) => {
<Avatar size="large" icon={<UserOutlined />} /> <Avatar size="large" icon={<UserOutlined />} />
<div> <div>
<Text strong>{user.name}</Text> <Text strong>{user.name}</Text>
<div style={{ display: 'flex', alignItems: 'center', gap: '4px' }}> <div
style={{
display: 'flex',
alignItems: 'center',
gap: '4px',
}}
>
<PhoneOutlined style={{ color: '#8c8c8c' }} /> <PhoneOutlined style={{ color: '#8c8c8c' }} />
<Text type="secondary">{user.phone}</Text> <Text type="secondary">{user.phone}</Text>
</div> </div>

54
src/pages/notification/detail/UserHistory.jsx
View File

@@ -1,14 +1,37 @@
import React from 'react'; import React from 'react';
import { Button, Row, Col, Card, Badge, Typography, Space, Divider } from 'antd'; import { Button, Row, Col, Card, Badge, Typography, Space, Divider } from 'antd';
import { SendOutlined, MobileOutlined, CheckCircleFilled, ArrowLeftOutlined } from '@ant-design/icons'; import {
SendOutlined,
MobileOutlined,
CheckCircleFilled,
ArrowLeftOutlined,
} from '@ant-design/icons';
const { Text } = Typography; const { Text } = Typography;
// Dummy data for user history // Dummy data for user history
const userHistoryData = [ const userHistoryData = [
{ id: 1, name: 'John Doe', phone: '081234567890', status: 'Delivered', timestamp: '04-11-2025 11:40 WIB' }, {
{ id: 2, name: 'Jane Smith', phone: '087654321098', status: 'Delivered', timestamp: '04-11-2025 11:41 WIB' }, id: 1,
{ id: 3, name: 'Peter Jones', phone: '082345678901', status: 'Delivered', timestamp: '04-11-2025 11:42 WIB' }, name: 'John Doe',
phone: '081234567890',
status: 'Delivered',
timestamp: '04-11-2025 11:40 WIB',
},
{
id: 2,
name: 'Jane Smith',
phone: '087654321098',
status: 'Delivered',
timestamp: '04-11-2025 11:41 WIB',
},
{
id: 3,
name: 'Peter Jones',
phone: '082345678901',
status: 'Delivered',
timestamp: '04-11-2025 11:42 WIB',
},
]; ];
const UserHistory = ({ notification, onBack }) => { const UserHistory = ({ notification, onBack }) => {
@@ -18,7 +41,9 @@ const UserHistory = ({ notification, onBack }) => {
<Col> <Col>
<Space align="center"> <Space align="center">
<Button type="text" icon={<ArrowLeftOutlined />} onClick={onBack} /> <Button type="text" icon={<ArrowLeftOutlined />} onClick={onBack} />
<Typography.Title level={4} style={{ margin: 0 }}>User History Notification</Typography.Title> <Typography.Title level={4} style={{ margin: 0 }}>
History User Notification
</Typography.Title>
</Space> </Space>
<Text type="secondary" style={{ marginLeft: '40px' }}> <Text type="secondary" style={{ marginLeft: '40px' }}>
{notification.title} - {notification.issue} {notification.title} - {notification.issue}
@@ -27,25 +52,34 @@ const UserHistory = ({ notification, onBack }) => {
</Row> </Row>
<Space direction="vertical" size="middle" style={{ display: 'flex' }}> <Space direction="vertical" size="middle" style={{ display: 'flex' }}>
{userHistoryData.map(user => ( {userHistoryData.map((user) => (
<Card key={user.id} style={{ backgroundColor: '#e6f7ff', borderColor: '#91d5ff' }}> <Card
key={user.id}
style={{ backgroundColor: '#e6f7ff', borderColor: '#91d5ff' }}
>
<Row align="middle" justify="space-between"> <Row align="middle" justify="space-between">
<Col> <Col>
<Space align="center"> <Space align="center">
<Text strong>{user.name}</Text> <Text strong>{user.name}</Text>
<Text>|</Text> <Text>|</Text>
<Text><MobileOutlined /> {user.phone}</Text> <Text>
<MobileOutlined /> {user.phone}
</Text>
<Text>|</Text> <Text>|</Text>
<Badge status="success" text={user.status} /> <Badge status="success" text={user.status} />
</Space> </Space>
<Divider style={{ margin: '8px 0' }} /> <Divider style={{ margin: '8px 0' }} />
<Space align="center"> <Space align="center">
<CheckCircleFilled style={{ color: '#52c41a' }} /> <CheckCircleFilled style={{ color: '#52c41a' }} />
<Text type="secondary">Success Delivered at {user.timestamp}</Text> <Text type="secondary">
Success Delivered at {user.timestamp}
</Text>
</Space> </Space>
</Col> </Col>
<Col> <Col>
<Button type="primary" ghost icon={<SendOutlined />}>Resend</Button> <Button type="primary" ghost icon={<SendOutlined />}>
Resend
</Button>
</Col> </Col>
</Row> </Row>
</Card> </Card>

869
src/pages/notificationDetail/IndexNotificationDetail.jsx
View File

@@ -14,6 +14,8 @@ import {
message, message,
Avatar, Avatar,
Tag, Tag,
Badge,
Divider,
} from 'antd'; } from 'antd';
import { import {
ArrowLeftOutlined, ArrowLeftOutlined,
@@ -33,12 +35,16 @@ import {
CheckCircleOutlined, CheckCircleOutlined,
SyncOutlined, SyncOutlined,
SendOutlined, SendOutlined,
MobileOutlined,
ClockCircleOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import { import {
getNotificationDetail, getNotificationDetail,
createNotificationLog, createNotificationLog,
getNotificationLogByNotificationId, getNotificationLogByNotificationId,
updateIsRead,
resendNotificationToUser, resendNotificationToUser,
resendChatByUser,
} from '../../api/notification'; } from '../../api/notification';
const { Content } = Layout; const { Content } = Layout;
@@ -107,8 +113,19 @@ const getUsersFromNotification = (notification) => {
id: user.notification_error_user_id.toString(), id: user.notification_error_user_id.toString(),
name: user.contact_name, name: user.contact_name,
phone: user.contact_phone, phone: user.contact_phone,
status: user.is_send ? 'sent' : 'pending', status: user.is_send ? 'Delivered' : 'Pending',
loading: user.loading || false, loading: user.loading || false,
timestamp: user.updated_at
? new Date(user.updated_at)
.toLocaleString('id-ID', {
day: '2-digit',
month: '2-digit',
year: 'numeric',
hour: '2-digit',
minute: '2-digit',
})
.replace('.', ':') + ' WIB'
: 'N/A',
})); }));
}; };
@@ -241,6 +258,9 @@ const NotificationDetailTab = (props) => {
// Fetch log history // Fetch log history
fetchLogHistory(notificationId); fetchLogHistory(notificationId);
// Fetch using the actual API
const resUpdate = await updateIsRead(notificationId);
} else { } else {
throw new Error('Notification not found'); throw new Error('Notification not found');
} }
@@ -374,7 +394,7 @@ const NotificationDetailTab = (props) => {
<Text>{notification.title}</Text> <Text>{notification.title}</Text>
<div style={{ marginTop: '2px' }}> <div style={{ marginTop: '2px' }}>
<Text strong style={{ fontSize: '16px' }}> <Text strong style={{ fontSize: '16px' }}>
{notification.issue} Error Code {notification.issue}
</Text> </Text>
</div> </div>
</Col> </Col>
@@ -462,101 +482,56 @@ const NotificationDetailTab = (props) => {
<Row align="middle" justify="space-between"> <Row align="middle" justify="space-between">
<Col> <Col>
<Space align="center"> <Space align="center">
<Avatar <Text strong>{user.name}</Text>
size="large" <Text>|</Text>
icon={<UserOutlined />} <Text>
<MobileOutlined /> {user.phone}
</Text>
<Text>|</Text>
<Badge
status={
user.status === 'Delivered'
? 'success'
: 'default'
}
text={user.status}
/> />
<div> </Space>
<Text strong>{user.name}</Text> <Divider style={{ margin: '8px 0' }} />
<div <Space align="center">
style={{ {user.status === 'Delivered' ? (
display: 'flex', <CheckCircleFilled
alignItems: 'center', style={{ color: '#52c41a' }}
gap: '4px', />
}} ) : (
> <ClockCircleOutlined
<PhoneOutlined style={{ color: '#faad14' }}
style={{ />
color: '#8c8c8c', )}
}} <Text type="secondary">
/> {user.status === 'Delivered'
<Text type="secondary"> ? 'Success Delivered at'
{user.phone} : 'Status '}{' '}
</Text> {user.timestamp}
</div> </Text>
</div>
</Space> </Space>
</Col> </Col>
<Col> <Col>
<Space align="center" size="large"> <Col>
{getStatusTag(user.status)}
<Button <Button
type="primary" type="primary"
ghost
icon={<SendOutlined />} icon={<SendOutlined />}
size="small" onClick={async () => {
loading={user.loading} await resendChatByUser(
onClick={async (e) => { user.id,
e.stopPropagation(); user.phone
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 Resend
</Button> </Button>
</Space> </Col>
</Col> </Col>
</Row> </Row>
</Card> </Card>
@@ -567,393 +542,407 @@ const NotificationDetailTab = (props) => {
</Col> </Col>
</Row> </Row>
<Row gutter={[8, 8]} style={{ marginBottom: 'px' }}> <Row gutter={[8, 8]}>
<Col xs={24} md={8}> <Col xs={24} md={8}>
<Card <div>
hoverable <Card
bodyStyle={{ padding: '12px', textAlign: 'center' }} hoverable
> bodyStyle={{ padding: '12px'}}
<Space>
<BookOutlined
style={{ fontSize: '16px', color: '#1890ff' }}
/>
<Text strong style={{ fontSize: '16px', color: '#262626' }}>
Handling Guideline
</Text>
</Space>
</Card>
</Col>
<Col xs={24} md={8}>
<Card
hoverable
bodyStyle={{ padding: '12px', textAlign: 'center' }}
>
<Space>
<ToolOutlined
style={{ fontSize: '16px', color: '#1890ff' }}
/>
<Text strong style={{ fontSize: '16px', color: '#262626' }}>
Spare Part
</Text>
</Space>
</Card>
</Col>
<Col xs={24} md={8}>
<Card bodyStyle={{ padding: '12px', textAlign: 'center' }}>
<Space>
<HistoryOutlined
style={{ fontSize: '16px', color: '#1890ff' }}
/>
<Text strong style={{ fontSize: '16px', color: '#262626' }}>
Log Activity
</Text>
</Space>
</Card>
</Col>
</Row>
<Row gutter={[8, 8]} style={{ marginTop: '-12px' }}>
<Col xs={24} md={8}>
<Card
size="small"
title="Guideline Documents"
style={{ height: '100%' }}
>
<Space
direction="vertical"
size="small"
style={{ width: '100%' }}
> >
{notification.error_code?.solution && <Space>
notification.error_code.solution.length > 0 ? ( <BookOutlined
<> style={{ fontSize: '16px', color: '#1890ff' }}
{notification.error_code.solution />
.filter((sol) => sol.is_active) // Hanya tampilkan solusi yang aktif <Text
.map((sol, index) => ( strong
<div style={{ fontSize: '16px', color: '#262626' }}
key={ >
sol.brand_code_solution_id || index Handling Guideline
} </Text>
> </Space>
{sol.path_document ? (
<Card <Space
size="small" direction="vertical"
bodyStyle={{ size="small"
padding: '8px 12px', style={{ width: '100%' }}
marginBottom: '4px', >
}} {notification.error_code?.solution &&
hoverable notification.error_code.solution.length > 0 ? (
extra={ <>
<Text {notification.error_code.solution
type="secondary" .filter((sol) => sol.is_active) // Hanya tampilkan solusi yang aktif
style={{ .map((sol, index) => (
fontSize: '10px', <div
}} key={
> sol.brand_code_solution_id ||
PDF index
</Text> }
} >
> {sol.path_document ? (
<div <Card
style={{ size="small"
display: 'flex', bodyStyle={{
justifyContent: padding: '8px 12px',
'space-between', marginBottom: '4px',
alignItems: 'center',
}} }}
> hoverable
<div> extra={
<Text <Text
type="secondary"
style={{ style={{
fontSize: fontSize:
'12px', '10px',
color: '#262626',
}} }}
> >
<FilePdfOutlined PDF
style={{
marginRight:
'8px',
}}
/>{' '}
{sol.file_upload_name ||
'Solution Document.pdf'}
</Text> </Text>
<Link }
href={sol.path_document.replace( >
'/detail-notification/pdf/',
'/notification-detail/pdf/'
)}
target="_blank"
style={{
fontSize:
'12px',
display:
'block',
}}
>
lihat disini
</Link>
</div>
</div>
</Card>
) : null}
{sol.type_solution === 'text' &&
sol.text_solution ? (
<Card
size="small"
bodyStyle={{
padding: '8px 12px',
marginBottom: '4px',
}}
extra={
<Text
type="secondary"
style={{
fontSize: '10px',
}}
>
{sol.type_solution.toUpperCase()}
</Text>
}
>
<div>
<Text strong>
{sol.solution_name}:
</Text>
<div <div
style={{ style={{
marginTop: '4px', display: 'flex',
justifyContent:
'space-between',
alignItems:
'center',
}} }}
> >
{sol.text_solution} <div>
<Text
style={{
fontSize:
'12px',
color: '#262626',
}}
>
<FilePdfOutlined
style={{
marginRight:
'8px',
}}
/>{' '}
{sol.file_upload_name ||
'Solution Document.pdf'}
</Text>
<Link
href={sol.path_document.replace(
'/detail-notification/pdf/',
'/notification-detail/pdf/'
)}
target="_blank"
style={{
fontSize:
'12px',
display:
'block',
}}
>
lihat disini
</Link>
</div>
</div> </div>
</div> </Card>
</Card> ) : null}
) : null} {sol.type_solution === 'text' &&
</div> sol.text_solution ? (
))} <Card
</> size="small"
) : ( title={
<div <Text strong>
style={{ {sol.solution_name}:
textAlign: 'center', </Text>
padding: '20px', }
color: '#8c8c8c', bodyStyle={{
}} padding: '8px 12px',
> marginBottom: '4px',
Tidak ada dokumen solusi tersedia }}
</div> extra={
)} <Text
</Space> type="secondary"
</Card> style={{
fontSize:
'10px',
}}
>
{sol.type_solution.toUpperCase()}
</Text>
}
>
<div>
<div
style={{
marginTop:
'4px',
}}
>
{sol.text_solution}
</div>
</div>
</Card>
) : null}
</div>
))}
</>
) : (
<div
style={{
textAlign: 'center',
padding: '20px',
color: '#8c8c8c',
}}
>
Tidak ada dokumen solusi tersedia
</div>
)}
</Space>
</Card>
</div>
</Col> </Col>
<Col xs={24} md={8}> <Col xs={24} md={8}>
<Card <div>
size="small" <Card
title="Required Spare Parts" hoverable
style={{ height: '100%' }} bodyStyle={{ padding: '12px'}}
>
<Space
direction="vertical"
size="small"
style={{ width: '100%' }}
> >
{notification.spareparts && <Space>
notification.spareparts.length > 0 ? ( <ToolOutlined
notification.spareparts.map((sparepart, index) => ( style={{ fontSize: '16px', color: '#1890ff' }}
<Card />
size="small" <Text
key={index} strong
bodyStyle={{ padding: '12px' }} style={{ fontSize: '16px', color: '#262626' }}
hoverable >
> Spare Part
<Row gutter={16} align="top"> </Text>
<Col </Space>
span={7}
style={{ textAlign: 'center' }} <Space
> direction="vertical"
<div size="small"
style={{ style={{ width: '100%' }}
width: '100%', >
height: '60px', {notification.spareparts &&
backgroundColor: '#f0f0f0', notification.spareparts.length > 0 ? (
display: 'flex', notification.spareparts.map((sparepart, index) => (
alignItems: 'center', <Card
justifyContent: 'center', size="small"
borderRadius: '4px', key={index}
marginBottom: '8px', bodyStyle={{ padding: '12px' }}
}} hoverable
>
<Row gutter={16} align="top">
<Col
span={7}
style={{ textAlign: 'center' }}
> >
<ToolOutlined
style={{
fontSize: '24px',
color: '#bfbfbf',
}}
/>
</div>
<Text
style={{
fontSize: '12px',
color:
sparepart.sparepart_stok ===
'Available' ||
sparepart.sparepart_stok ===
'available'
? '#52c41a'
: '#ff4d4f',
fontWeight: 500,
}}
>
{sparepart.sparepart_stok}
</Text>
</Col>
<Col span={17}>
<Space
direction="vertical"
size={4}
style={{ width: '100%' }}
>
<Text strong>
{sparepart.sparepart_name}
</Text>
<Paragraph
style={{
fontSize: '12px',
margin: 0,
color: '#595959',
}}
>
{sparepart.sparepart_description ||
'Deskripsi tidak tersedia'}
</Paragraph>
<div <div
style={{ style={{
border: '1px solid #d9d9d9', width: '100%',
height: '60px',
backgroundColor: '#f0f0f0',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
borderRadius: '4px', borderRadius: '4px',
padding: '4px 8px', marginBottom: '8px',
fontSize: '11px',
color: '#8c8c8c',
marginTop: '8px',
}} }}
> >
Kode: {sparepart.sparepart_code}{' '} <ToolOutlined
| Qty: {sparepart.sparepart_qty}{' '} style={{
| Unit:{' '} fontSize: '24px',
{sparepart.sparepart_unit} color: '#bfbfbf',
}}
/>
</div> </div>
</Space> <Text
</Col> style={{
</Row> fontSize: '12px',
</Card> color:
)) sparepart.sparepart_stok ===
) : ( 'Available' ||
<div sparepart.sparepart_stok ===
style={{ 'available'
textAlign: 'center', ? '#52c41a'
padding: '20px', : '#ff4d4f',
color: '#8c8c8c', fontWeight: 500,
}} }}
> >
Tidak ada spare parts terkait {sparepart.sparepart_stok}
</div> </Text>
)} </Col>
</Space> <Col span={17}>
</Card> <Space
</Col> direction="vertical"
<Col span={8}> size={4}
<Card size="small" style={{ height: '100%' }}> style={{ width: '100%' }}
<Space >
direction="vertical" <Text strong>
size="small" {sparepart.sparepart_name}
style={{ width: '100%' }} </Text>
> <Paragraph
<Card style={{
size="small" fontSize: '12px',
bodyStyle={{ margin: 0,
padding: '8px 12px', color: '#595959',
backgroundColor: isAddingLog ? '#fafafa' : '#fff', }}
}} >
> {sparepart.sparepart_description ||
<Space 'Deskripsi tidak tersedia'}
direction="vertical" </Paragraph>
style={{ width: '100%' }} <div
size="small" style={{
> border: '1px solid #d9d9d9',
{isAddingLog && ( borderRadius: '4px',
<> padding: '4px 8px',
<Text strong style={{ fontSize: '12px' }}> fontSize: '11px',
Add New Log / Update Progress color: '#8c8c8c',
</Text> marginTop: '8px',
<Input.TextArea }}
rows={2} >
placeholder="Tuliskan update penanganan di sini..." Kode:{' '}
value={newLogDescription} {sparepart.sparepart_code} |
onChange={(e) => Qty:{' '}
setNewLogDescription(e.target.value) {sparepart.sparepart_qty} |
} Unit:{' '}
disabled={submitLoading} {sparepart.sparepart_unit}
/> </div>
</> </Space>
)} </Col>
<Button </Row>
type={isAddingLog ? 'primary' : 'dashed'} </Card>
size="small" ))
block ) : (
icon={ <div
submitLoading ? ( style={{
<LoadingOutlined /> textAlign: 'center',
) : ( padding: '20px',
!isAddingLog && <PlusOutlined /> color: '#8c8c8c',
) }}
}
onClick={
isAddingLog
? handleSubmitLog
: () => setIsAddingLog(true)
}
loading={submitLoading}
disabled={submitLoading}
> >
{isAddingLog ? 'Submit Log' : 'Add Log'} Tidak ada spare parts terkait
</Button> </div>
{isAddingLog && ( )}
<Button </Space>
size="small" </Card>
block </div>
onClick={() => { </Col>
setIsAddingLog(false); <Col xs={24} md={8}>
setNewLogDescription(''); <div>
}} <Card bodyStyle={{ padding: '12px'}}>
disabled={submitLoading} <Space>
> <HistoryOutlined
Cancel style={{ fontSize: '16px', color: '#1890ff' }}
</Button> />
)} <Text
</Space> strong
</Card> style={{ fontSize: '16px', color: '#262626' }}
{logHistoryData.map((log) => ( >
Log Activity
</Text>
</Space>
<Space
direction="vertical"
size="small"
style={{ width: '100%' }}
>
<Card <Card
key={log.id}
size="small" size="small"
bodyStyle={{ bodyStyle={{
padding: '8px 12px', padding: '8px 12px',
backgroundColor: isAddingLog
? '#fafafa'
: '#fff',
}} }}
> >
<Paragraph <Space
style={{ fontSize: '12px', margin: 0 }} direction="vertical"
ellipsis={{ rows: 2 }} style={{ width: '100%' }}
size="small"
> >
<Text strong>{log.addedBy.name}:</Text>{' '} {isAddingLog && (
{log.description} <>
</Paragraph> <Text
<Text type="secondary" style={{ fontSize: '11px' }}> strong
{log.timestamp} style={{ fontSize: '12px' }}
</Text> >
Add New Log / Update Progress
</Text>
<Input.TextArea
rows={2}
placeholder="Tuliskan update penanganan di sini..."
value={newLogDescription}
onChange={(e) =>
setNewLogDescription(
e.target.value
)
}
disabled={submitLoading}
/>
</>
)}
<Button
type={isAddingLog ? 'primary' : 'dashed'}
size="small"
block
icon={
submitLoading ? (
<LoadingOutlined />
) : (
!isAddingLog && <PlusOutlined />
)
}
onClick={
isAddingLog
? handleSubmitLog
: () => setIsAddingLog(true)
}
loading={submitLoading}
disabled={submitLoading}
>
{isAddingLog ? 'Submit Log' : 'Add Log'}
</Button>
{isAddingLog && (
<Button
size="small"
block
onClick={() => {
setIsAddingLog(false);
setNewLogDescription('');
}}
disabled={submitLoading}
>
Cancel
</Button>
)}
</Space>
</Card> </Card>
))} {logHistoryData.map((log) => (
</Space> <Card
</Card> key={log.id}
size="small"
bodyStyle={{
padding: '8px 12px',
}}
>
<Paragraph
style={{ fontSize: '12px', margin: 0 }}
// ellipsis={{ rows: 2 }}
>
<Text strong>{log.addedBy.name}:</Text>{' '}
{log.description}
</Paragraph>
<Text
type="secondary"
style={{ fontSize: '11px' }}
>
{log.timestamp}
</Text>
</Card>
))}
</Space>
</Card>
</div>
</Col> </Col>
</Row> </Row>
</Space> </Space>