opengnsys
/
oggui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix installedOgLives in global status components
testing/ogGui-multibranch/pipeline/head This commit looks good Details

pull/18/head
Lucas Lara García 2025-03-19 14:02:04 +01:00
parent 07acbc5f87
commit 7e133f2b2b
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ogWebconsole/src/app/components/global-status/global-status.component.html
View File

@ -1,5 +1,5 @@
<header> <header>
<h1 mat-dialog-title>Estado global de la aplicación</h1> <h1 mat-dialog-title>{{'GlobalStatus' | translate}}</h1>
</header> </header>
<mat-dialog-content> <mat-dialog-content>
<mat-tab-group (selectedTabChange)="onTabChange($event)"> <mat-tab-group (selectedTabChange)="onTabChange($event)">

13
ogWebconsole/src/app/components/global-status/global-status.component.ts
View File

@ -44,7 +44,7 @@ export class GlobalStatusComponent implements OnInit {
this.loadOgBootStatus(); this.loadOgBootStatus();
} }
loadStatus(apiUrl: string, diskUsage: any, servicesStatus: any, diskUsageChartData: any[]): void { loadStatus(apiUrl: string, diskUsage: any, servicesStatus: any, diskUsageChartData: any[], installedOgLives: any[]): void {
this.loading = true; this.loading = true;
const timeoutId = setTimeout(() => { const timeoutId = setTimeout(() => {
this.loading = false; this.loading = false;
@ -57,8 +57,11 @@ export class GlobalStatusComponent implements OnInit {
diskUsage.total = data.message.disk_usage.total; diskUsage.total = data.message.disk_usage.total;
diskUsage.percentage = data.message.disk_usage.percentage; diskUsage.percentage = data.message.disk_usage.percentage;
servicesStatus = data.message.services_status; Object.assign(servicesStatus, data.message.services_status);
this.installedOgLives = data.message.installed_oglives; installedOgLives.length = 0;
if (data.message.installed_oglives) {
installedOgLives.push(...data.message.installed_oglives);
}
diskUsageChartData.length = 0; diskUsageChartData.length = 0;
diskUsageChartData.push( diskUsageChartData.push(
@ -79,11 +82,11 @@ export class GlobalStatusComponent implements OnInit {
} }
loadOgBootStatus(): void { loadOgBootStatus(): void {
this.loadStatus(this.ogBootApiUrl, this.ogBootDiskUsage, this.ogBootServicesStatus, this.ogBootDiskUsageChartData) this.loadStatus(this.ogBootApiUrl, this.ogBootDiskUsage, this.ogBootServicesStatus, this.ogBootDiskUsageChartData, this.installedOgLives);
} }
loadDhcpStatus(): void { loadDhcpStatus(): void {
this.loadStatus(this.dhcpApiUrl, this.dhcpDiskUsage, this.dhcpServicesStatus, this.dhcpDiskUsageChartData) this.loadStatus(this.dhcpApiUrl, this.dhcpDiskUsage, this.dhcpServicesStatus, this.dhcpDiskUsageChartData, this.installedOgLives);
} }
onTabChange(event: MatTabChangeEvent): void { onTabChange(event: MatTabChangeEvent): void {

1
ogWebconsole/src/app/components/global-status/status-tab/status-tab.component.ts
View File

@ -26,6 +26,7 @@ export class StatusTabComponent {
name: key, name: key,
status: this.servicesStatus[key] status: this.servicesStatus[key]
})) }))
console.log(services)
return services; return services;
} }