From 5ec26ecbe8d8f3c36debc71bb694a58de377cc23 Mon Sep 17 00:00:00 2001 From: vinix Date: Tue, 21 Oct 2025 15:23:02 +0700 Subject: [PATCH] feat: update device management to include device description and change status display --- src/pages/master/device/component/DetailDevice.jsx | 3 ++- src/pages/master/device/component/ListDevice.jsx | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pages/master/device/component/DetailDevice.jsx b/src/pages/master/device/component/DetailDevice.jsx index a0d951a..fc06dde 100644 --- a/src/pages/master/device/component/DetailDevice.jsx +++ b/src/pages/master/device/component/DetailDevice.jsx @@ -53,10 +53,11 @@ const DetailDevice = (props) => { device_name: formData.device_name, is_active: formData.is_active, device_location: formData.device_location, + device_description: formData.device_description, ip_address: formData.ip_address, }; - const response = !formData.device_id + const response = formData.device_id ? await updateDevice(formData.device_id, payload) : await createDevice(payload); diff --git a/src/pages/master/device/component/ListDevice.jsx b/src/pages/master/device/component/ListDevice.jsx index fd7d392..fb0d64f 100644 --- a/src/pages/master/device/component/ListDevice.jsx +++ b/src/pages/master/device/component/ListDevice.jsx @@ -48,13 +48,13 @@ const columns = (showPreviewModal, showEditModal, showDeleteDialog) => [ }, { title: 'Status', - dataIndex: 'device_status', - key: 'device_status', + dataIndex: 'is_active', + key: 'is_active', width: '10%', align: 'center', - render: (_, { device_status }) => ( + render: (_, { is_active }) => ( <> - {device_status === true ? ( + {is_active === true ? ( Running