From b646cd44777382bb1d513d8ffb34aedcfa4984e5 Mon Sep 17 00:00:00 2001
From: Albrecht Lohofener <albrechtloh@gmx.de>
Date: Wed, 26 Mar 2025 17:29:31 +0100
Subject: [PATCH] Improve showing of IP adresses

---
 .../src/app/backend-communication.service.ts  | 27 ++++++++--
 .../app/dashboard/dashboard.component.html    | 54 ++++++++++---------
 .../src/app/dashboard/dashboard.component.ts  |  2 +-
 3 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/web-frontend/src/app/backend-communication.service.ts b/web-frontend/src/app/backend-communication.service.ts
index 1ed1821..9afdffc 100644
--- a/web-frontend/src/app/backend-communication.service.ts
+++ b/web-frontend/src/app/backend-communication.service.ts
@@ -18,8 +18,8 @@ interface AttachedHardware {
   providedIn: 'root'
 })
 export class BackendCommunicationService {
-  urlPrefix: string = 'http://localhost:8006'; // Just for development
-  //urlPrefix: string = '';
+  //urlPrefix: string = 'http://localhost:8006'; // Just for development
+  urlPrefix: string = '';
 
   constructor(private http: HttpClient) { }
 
@@ -114,7 +114,7 @@ export class BackendCommunicationService {
     return this.http.get<any>(this.urlPrefix + '/api/get_openwrt_ip_addresses').pipe(
       tap(response => console.log('Fetched OpenWrt IP addresses: ', response)),
       map(response => {
-        let tmpEthernetInterfaces= '';
+        let tmpEthernetInterfaces= 'Unknown';
         if (response['combined_output'] !== '\n') {
           try {
             response['combined_output'] = JSON.parse(response['combined_output']);
@@ -129,4 +129,25 @@ export class BackendCommunicationService {
       })
     );
   }
+
+  pollOpenWrtIpAddresses(intervalMs: number = 1000): Observable<any> {
+    return new Observable(observer => {
+      const poll = () => {
+        this.getOpenWrtIpAddresses().subscribe({
+          next: (response) => {
+            if (response.ethernetInterfaces !== 'Unknown') {
+              observer.next(response);
+              observer.complete();
+            } else {
+              setTimeout(poll, intervalMs);
+            }
+          },
+          error: (error) => {
+            observer.error(error);
+          }
+        });
+      };
+      poll();
+    });
+  }
 }
diff --git a/web-frontend/src/app/dashboard/dashboard.component.html b/web-frontend/src/app/dashboard/dashboard.component.html
index a4d4f4d..4b305bd 100644
--- a/web-frontend/src/app/dashboard/dashboard.component.html
+++ b/web-frontend/src/app/dashboard/dashboard.component.html
@@ -1,5 +1,5 @@
 <div class="grid-container">
-  <mat-grid-list cols="2" rowHeight="300px">
+  <mat-grid-list cols="2" rowHeight="280px">
     <mat-grid-tile [colspan]="1" [rowspan]="1">
       <mat-card class="dashboard-card">
         <mat-card-header>
@@ -7,18 +7,18 @@
         </mat-card-header>
         <mat-card-content class="dashboard-card-content">
           @if (openwrtVersion) {
-            <mat-list role="list">
-              <mat-list-item role="listitem">
-                <mat-icon matListItemIcon>router</mat-icon>
-                {{ openwrtVersion }}
-              </mat-list-item>
-              <mat-list-item role="listitem">
-                <mat-icon matListItemIcon>info</mat-icon>
-                Linux kernel {{ openWrtKernel }}
-              </mat-list-item>
-            </mat-list>
+          <mat-list role="list">
+            <mat-list-item role="listitem">
+              <mat-icon matListItemIcon>router</mat-icon>
+              {{ openwrtVersion }}
+            </mat-list-item>
+            <mat-list-item role="listitem">
+              <mat-icon matListItemIcon>info</mat-icon>
+              Linux kernel {{ openWrtKernel }}
+            </mat-list-item>
+          </mat-list>
           } @else {
-            <mat-spinner [diameter]="50"></mat-spinner>
+          <mat-spinner [diameter]="50"></mat-spinner>
           }
         </mat-card-content>
       </mat-card>
@@ -40,16 +40,16 @@
               LAN: {{ lan }}
             </mat-list-item>
             @for (usbDevice of usb; track usbDevice) {
-              <mat-list-item role="listitem">
-                <mat-icon matListItemIcon>usb</mat-icon>
-                USB: {{ usbDevice }}
-              </mat-list-item>
+            <mat-list-item role="listitem">
+              <mat-icon matListItemIcon>usb</mat-icon>
+              USB: {{ usbDevice }}
+            </mat-list-item>
             }
             @for (pciDevice of pci; track pciDevice) {
-              <mat-list-item role="listitem">
-                <mat-icon matListItemIcon>memory</mat-icon>
-                PCI: {{ pciDevice }}
-              </mat-list-item>
+            <mat-list-item role="listitem">
+              <mat-icon matListItemIcon>memory</mat-icon>
+              PCI: {{ pciDevice }}
+            </mat-list-item>
             }
           </mat-list>
         </mat-card-content>
@@ -60,16 +60,20 @@
     <mat-grid-tile [colspan]="2" [rowspan]="1">
       <mat-card class="dashboard-card">
         <mat-card-header>
-          <mat-card-title>Ethernet interfaces</mat-card-title>
+          <mat-card-title>IP addresses</mat-card-title>
         </mat-card-header>
         <mat-card-content class="dashboard-card-content">
           <mat-list role="list">
             @if (ethernetInterfaces) {
               @for (ethernetInterface of ethernetInterfaces; track ethernetInterface) {
-                <mat-list-item role="listitem">
-                  <mat-icon matListItemIcon>settings_ethernet</mat-icon>
-                  {{ ethernetInterface.ifname }}: {{ ethernetInterface.address }}
-                </mat-list-item>
+                <!-- Filter out loopback device and interface with no IP -->
+                @if (ethernetInterface.ifname !=='lo' && ethernetInterface.addr_info.length !== 0) {
+                  <mat-list-item role="listitem">
+                    <mat-icon matListItemIcon>settings_ethernet</mat-icon>
+                    <span matListItemTitle>{{ ethernetInterface.ifname }} ({{ ethernetInterface.address }})</span>
+                    <span matListItemLine>@for (ipAddress of ethernetInterface.addr_info; track $index) {{{ ipAddress.local }} } </span>
+                  </mat-list-item>
+                }
               }
             } @else {
               <mat-spinner [diameter]="50"></mat-spinner>
diff --git a/web-frontend/src/app/dashboard/dashboard.component.ts b/web-frontend/src/app/dashboard/dashboard.component.ts
index c9863ef..b904023 100644
--- a/web-frontend/src/app/dashboard/dashboard.component.ts
+++ b/web-frontend/src/app/dashboard/dashboard.component.ts
@@ -48,7 +48,7 @@ export class DashboardComponent {
       this.pci = response.pci;
     });
 
-    this.service.getOpenWrtIpAddresses().subscribe(response => {
+    this.service.pollOpenWrtIpAddresses().subscribe(response => {
       this.ethernetInterfaces = response.ethernetInterfaces;
     });
   }