From 9bd09a7c76cbc7621f388743720c5eccf982f04d Mon Sep 17 00:00:00 2001
From: Manuel Aranda <maranda@qindel.com>
Date: Tue, 20 Aug 2024 10:30:02 +0200
Subject: [PATCH] Updated ogBoot components view

---
 .../images/images/images.component.html       | 27 ++++++++++++++++---
 .../images/images/images.component.ts         | 13 ++++++---
 .../app/components/pxe/pxe/pxe.component.html | 13 +++++++--
 .../app/components/pxe/pxe/pxe.component.ts   |  2 +-
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/ogWebconsole/src/app/components/images/images/images.component.html b/ogWebconsole/src/app/components/images/images/images.component.html
index 709cc21..3a310b2 100644
--- a/ogWebconsole/src/app/components/images/images/images.component.html
+++ b/ogWebconsole/src/app/components/images/images/images.component.html
@@ -6,8 +6,8 @@
         <mat-icon [style.color]="getIcon().color">{{ getIcon().name }}</mat-icon>
       </mat-panel-description>
     </mat-expansion-panel-header>
-    <p *ngIf="alertMessage">Isos alojadas en servidor ogBoot: {{ alertMessage }}</p>
-    <p *ngIf="alertMessage">Isos alojadas en servidor ogCore (base de datos): {{ length }}</p>
+    <p *ngIf="alertMessage">Oglives creados en servidor ogBoot: {{ alertMessage }}</p>
+    <p *ngIf="alertMessage">Oglives creados en servidor ogCore (base de datos): {{ length }}</p>
   </mat-expansion-panel>
 </mat-accordion>
 
@@ -23,11 +23,30 @@
     <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
     <td mat-cell *matCellDef="let image" [ngClass]="{'clickable': column.columnDef === 'name'}"
         (click)="column.columnDef === 'name' && showInfo(image)">
-      {{ column.cell(image) }}
+
+      <!-- Condición para mostrar íconos para isDefault e installed -->
+      <ng-container *ngIf="column.columnDef === 'isDefault' || column.columnDef === 'installed'">
+        <mat-icon [color]="image[column.columnDef] ? 'primary' : 'warn'">
+          {{ image[column.columnDef] ? 'check_circle' : 'cancel' }}
+        </mat-icon>
+      </ng-container>
+
+      <!-- Mostrar el downloadUrl truncado con tooltip -->
+      <ng-container *ngIf="column.columnDef === 'downloadUrl'">
+      <span matTooltip="{{ image.downloadUrl }}">
+        {{ image.downloadUrl ? image.downloadUrl.substring(0, 20) + '...' : '' }}
+      </span>
+      </ng-container>
+
+      <!-- Mostrar otros campos normalmente -->
+      <ng-container *ngIf="column.columnDef !== 'isDefault' && column.columnDef !== 'installed' && column.columnDef !== 'downloadUrl'">
+        {{ column.cell(image) }}
+      </ng-container>
+
     </td>
-    <td mat-cell *matCellDef="let user" > {{ column.cell(user) }} </td>
   </ng-container>
 
+
   <ng-container matColumnDef="actions">
     <th mat-header-cell *matHeaderCellDef i18n="@@columnActions">Acciones</th>
     <td mat-cell *matCellDef="let image">
diff --git a/ogWebconsole/src/app/components/images/images/images.component.ts b/ogWebconsole/src/app/components/images/images/images.component.ts
index baa0e20..3686993 100644
--- a/ogWebconsole/src/app/components/images/images/images.component.ts
+++ b/ogWebconsole/src/app/components/images/images/images.component.ts
@@ -42,9 +42,14 @@ export class ImagesComponent implements OnInit {
       cell: (user: any) => `${user.downloadUrl}`
     },
     {
-      columnDef: 'default',
+      columnDef: 'isDefault',
       header: 'Imagen por defecto',
-      cell: (user: any) => `${user.default}`
+      cell: (user: any) => `${user.isDefault}`
+    },
+    {
+      columnDef: 'installed',
+      header: 'Imagen instalada en ogBoot',
+      cell: (user: any) => `${user.installed}`
     },
     {
       columnDef: 'createdAt',
@@ -183,10 +188,10 @@ export class ImagesComponent implements OnInit {
   }
 
   loadAlert() {
-    this.http.get(`${this.apiUrl}/server/get-isos`)
+    this.http.get(`${this.apiUrl}/server/get-collection`)
       .subscribe(response => {
         // @ts-ignore
-        this.alertMessage = response.data.downloads.length
+        this.alertMessage = response.length
       }, error => {
         console.error('Error al cargar la información del alert', error);
       });
diff --git a/ogWebconsole/src/app/components/pxe/pxe/pxe.component.html b/ogWebconsole/src/app/components/pxe/pxe/pxe.component.html
index 5812841..6d8321d 100644
--- a/ogWebconsole/src/app/components/pxe/pxe/pxe.component.html
+++ b/ogWebconsole/src/app/components/pxe/pxe/pxe.component.html
@@ -23,9 +23,18 @@
     <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
     <td mat-cell *matCellDef="let image" [ngClass]="{'clickable': column.columnDef === 'name'}"
         (click)="column.columnDef === 'name' && showPxeInfo(image)">
-      {{ column.cell(image) }}
+      <!-- Condición para mostrar íconos para isDefault e installed -->
+      <ng-container *ngIf="column.columnDef === 'synchronized'">
+        <mat-icon [color]="image[column.columnDef] ? 'primary' : 'warn'">
+          {{ image[column.columnDef] ? 'check_circle' : 'cancel' }}
+        </mat-icon>
+      </ng-container>
+
+      <!-- Mostrar otros campos normalmente -->
+      <ng-container *ngIf="column.columnDef !== 'synchronized'">
+        {{ column.cell(image) }}
+      </ng-container>
     </td>
-    <td mat-cell *matCellDef="let user" > {{ column.cell(user) }} </td>
   </ng-container>
 
   <ng-container matColumnDef="actions">
diff --git a/ogWebconsole/src/app/components/pxe/pxe/pxe.component.ts b/ogWebconsole/src/app/components/pxe/pxe/pxe.component.ts
index 8a5126d..f55874b 100644
--- a/ogWebconsole/src/app/components/pxe/pxe/pxe.component.ts
+++ b/ogWebconsole/src/app/components/pxe/pxe/pxe.component.ts
@@ -38,7 +38,7 @@ export class PxeComponent {
     {
       columnDef: 'synchronized',
       header: 'Creado en ogBoot',
-      cell: (user: any) => `${user.name}`
+      cell: (user: any) => `${user.synchronized}`
     },
     {
       columnDef: 'createdAt',