From 9401448d0c51d5add06d1335e489074ee3714af0 Mon Sep 17 00:00:00 2001
From: Manuel Aranda <maranda@qindel.com>
Date: Fri, 7 Feb 2025 12:17:47 +0100
Subject: [PATCH] refs #1479. Changed delete-permanent/delete-trash order

---
 .../components/images/images.component.html   | 12 ++++++-----
 .../app/components/images/images.component.ts | 20 -------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/ogWebconsole/src/app/components/images/images.component.html b/ogWebconsole/src/app/components/images/images.component.html
index 7a5793a..28fd055 100644
--- a/ogWebconsole/src/app/components/images/images.component.html
+++ b/ogWebconsole/src/app/components/images/images.component.html
@@ -29,9 +29,12 @@
     <mat-label i18n="@@searchLabel">Estado</mat-label>
     <mat-select [(ngModel)]="filters['status']" (selectionChange)="search()" placeholder="Seleccionar opción" >
       <mat-option [value]="'failed'">Fallido</mat-option>
-      <mat-option [value]="'pending'">Pendiente de ejecutar</mat-option>
-      <mat-option [value]="'in-progress'">Ejecutando</mat-option>
-      <mat-option [value]="'success'">Completado con éxito</mat-option>
+      <mat-option [value]="'pending'">Pendiente</mat-option>
+      <mat-option [value]="'in-progress'">Transfiriendo</mat-option>
+      <mat-option [value]="'success'">Creado con éxito</mat-option>
+      <mat-option [value]="'transferring'">En progreso</mat-option>
+      <mat-option [value]="'trash'">Papelera</mat-option>
+      <mat-option [value]="'aux-files-pending'">Creando archivos auxiliares</mat-option>
     </mat-select>
   </mat-form-field>
 </div>
@@ -80,7 +83,7 @@
     <td mat-cell *matCellDef="let image" style="text-align: center;">
       <button mat-icon-button color="info" (click)="showImageInfo($event, image)"><mat-icon i18n="@@deleteElementTooltip">visibility</mat-icon></button>
       <button mat-icon-button color="primary" (click)="editImage($event, image)" i18n="@@editImage"> <mat-icon>edit</mat-icon></button>
-      <button mat-icon-button color="warn" (click)="deleteImage($event, image)">
+      <button mat-icon-button color="warn" (click)="toggleAction(image, 'delete-trash')">
         <mat-icon i18n="@@deleteElementTooltip">delete</mat-icon>
       </button>
       <button mat-icon-button [matMenuTriggerFor]="menu">
@@ -88,7 +91,6 @@
       </button>
       <mat-menu #menu="matMenu">
         <button mat-menu-item (click)="toggleAction(image, 'get-aux')">Obtener ficheros auxiliares</button>
-        <button mat-menu-item [disabled]="!image.imageFullsum || image.status !== 'success'" (click)="toggleAction(image, 'delete-trash')">Eliminar imagen temporalmente</button>
         <button mat-menu-item [disabled]="!image.imageFullsum || image.status !== 'success'" (click)="toggleAction(image, 'delete-permanent')">Eliminar imagen</button>
         <button mat-menu-item [disabled]="!image.imageFullsum || image.status !== 'trash'" (click)="toggleAction(image, 'recover')">Recuperar imagen de la papelera</button>
         <button mat-menu-item [disabled]="!image.imageFullsum || image.status !== 'success'" (click)="toggleAction(image, 'transfer')">Transferir imagen</button>
diff --git a/ogWebconsole/src/app/components/images/images.component.ts b/ogWebconsole/src/app/components/images/images.component.ts
index 68b17c1..dfef3e1 100644
--- a/ogWebconsole/src/app/components/images/images.component.ts
+++ b/ogWebconsole/src/app/components/images/images.component.ts
@@ -150,26 +150,6 @@ export class ImagesComponent implements OnInit {
     }).afterClosed().subscribe(() => this.search());
   }
 
-  deleteImage(event: MouseEvent,command: any): void {
-    event.stopPropagation();
-    this.dialog.open(DeleteModalComponent, {
-      width: '300px',
-      data: { name: command.name },
-    }).afterClosed().subscribe((result) => {
-      if (result) {
-        this.http.delete(`${this.apiUrl}/${command.uuid}`).subscribe({
-          next: () => {
-            this.toastService.success('Imagen eliminada con éxito');
-            this.search();
-          },
-          error: (error) => {
-            console.error('Error al eliminar la imagen:', error);
-          }
-        });
-      }
-    });
-  }
-
   onPageChange(event: any): void {
     this.page = event.pageIndex;
     this.itemsPerPage = event.pageSize;