Refactor UI/mac ip rightbar info (#256)

Co-authored-by: Manuel <[email protected]>

Author: pgallino

src/graphics/renderables/device_info.ts

@@ -40,15 +40,27 @@ export class DeviceInfo extends BaseInfo {
     );
 
     const layer = this.device.viewgraph.getLayer();
+    const showIp = this.device.getType() !== DeviceType.Switch;
+    const showMac = layer === Layer.Link;
 
-    if (layer == Layer.Link) {
-      this.device.interfaces.forEach((iface) =>
+    if (showIp) {
+      this.device.interfaces.forEach((iface) => {
         this.information.addField(
-          TOOLTIP_KEYS.MAC_ADDRESS,
+          TOOLTIP_KEYS.IP_ADDRESS + (iface.name ? ` (${iface.name})` : ""),
+          iface.ip.toString(),
+          TOOLTIP_KEYS.IP_ADDRESS,
+        );
+      });
+    }
+
+    if (showMac) {
+      this.device.interfaces.forEach((iface) => {
+        this.information.addField(
+          TOOLTIP_KEYS.MAC_ADDRESS + (iface.name ? ` (${iface.name})` : ""),
           iface.mac.toString(),
           TOOLTIP_KEYS.MAC_ADDRESS,
-        ),
-      );
+        );
+      });
     }
   }
 

src/types/view-devices/vHost.ts

@@ -20,7 +20,6 @@ import { GlobalContext } from "../../context";
 import { DataHost } from "../data-devices";
 import { dropPacket } from "../packet";
 import { DeviceInfo } from "../../graphics/renderables/device_info";
-import { TOOLTIP_KEYS } from "../../utils/constants/tooltips_constants";
 import { TcpSegment } from "../../packets/tcp";
 import {
   TcpListener,
@@ -84,13 +83,6 @@ export class ViewHost extends ViewNetworkDevice {
     const programList = getProgramList(this.viewgraph, this.id);
 
     const info = new DeviceInfo(this);
-    this.interfaces.forEach((iface) =>
-      info.addField(
-        TOOLTIP_KEYS.IP_ADDRESS,
-        iface.ip.toString(),
-        TOOLTIP_KEYS.IP_ADDRESS,
-      ),
-    );
 
     info.addProgramRunner(this, programList);
 

src/types/view-devices/vRouter.ts

@@ -59,13 +59,6 @@ export class ViewRouter extends ViewNetworkDevice {
 
   showInfo(): void {
     const info = new DeviceInfo(this);
-    this.interfaces.forEach((iface) =>
-      info.addField(
-        TOOLTIP_KEYS.IP_ADDRESS,
-        iface.ip?.octets.join("."),
-        TOOLTIP_KEYS.IP_ADDRESS,
-      ),
-    );
 
     info.addProgressBar(
       TOOLTIP_KEYS.PACKET_QUEUE_USAGE,