fix(index devices device): monitor stop and delete now working correctly

steledama · Jan 9, 2022 · 3ab38b4 · 3ab38b4
1 parent a14da63
commit 3ab38b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/components/Device.jsx b/components/Device.jsx
@@ -9,10 +9,10 @@ function Device({ conf, device, onDelete, onStop }) {
 
   const handleClose = () => setShow(false);
   const handleShow = () => setShow(true);
-
+  const deviceIp = device.tags.find((el) => el.tag === 'deviceIp').value;
   const latestUrl = `http://${conf.server}/zabbix.php?action=latest.view&filter_hostids%5B%5D=${device.hostId}&filter_set=1`;
   const configUrl = `http://${conf.server}/hosts.php?form=update&hostid=${device.hostId}`;
-  const deviceUrl = `http://${device.ip}`;
+  const deviceUrl = `http://${deviceIp}`;
 
   async function monitorDevice() {
     setDeviceMessage({
@@ -21,8 +21,8 @@ function Device({ conf, device, onDelete, onStop }) {
     });
     const deviceResponse = await axios.post('/api/monitor', {
       conf,
-      serial: device.serial,
-      ip: device.ip,
+      serial: device.host,
+      ip: deviceIp,
     });
     // console.log(deviceResponse);
     setDeviceMessage({
@@ -39,7 +39,7 @@ function Device({ conf, device, onDelete, onStop }) {
             <Card.Link href={configUrl}>{device.name}</Card.Link>
           </Card.Title>
           <Card.Text>
-            Ip address: <Card.Link href={deviceUrl}>{device.ip}</Card.Link>
+            Ip address: <Card.Link href={deviceUrl}>{deviceIp}</Card.Link>
           </Card.Text>
           <Card.Link className="pr-3" href={latestUrl}>
             Latest data
@@ -54,7 +54,7 @@ function Device({ conf, device, onDelete, onStop }) {
           <Button
             className="mx-3"
             variant="warning"
-            onClick={() => onStop(device.host, device.hostId, device.ip)}
+            onClick={() => onStop(device.host, device.hostId, deviceIp)}
           >
             Stop monitor
           </Button>

diff --git a/components/Devices.jsx b/components/Devices.jsx
@@ -5,7 +5,7 @@ function Devices({ conf, devices, onDelete, onStop }) {
     <>
       {devices.map((device) => (
         <Device
-          key={device.serial}
+          key={device.host}
           conf={conf}
           device={device}
           onDelete={onDelete}

diff --git a/pages/index.jsx b/pages/index.jsx
@@ -180,16 +180,7 @@ export default function Home({ confProp, confAutoProp, confMessageProp }) {
         conf.token,
         conf.id
       );
-      if (devicesFromZabbix.result) {
-        const devicesFull = devicesFromZabbix.result.map((device) => ({
-          agentId: device.tags.find((el) => el.tag === 'agentId').value,
-          hostId: device.hostid,
-          ip: device.tags.find((el) => el.tag === 'deviceIp').value,
-          name: device.name,
-          serial: device.host,
-        }));
-        setDevices(devicesFull);
-      }
+      if (devicesFromZabbix.result) setDevices(devicesFromZabbix.result);
     }
     updateDevices();
   }, [conf.id, conf.server, conf.token]);