diff --git a/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.css b/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.css
index 2544ffc..195127a 100644
--- a/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.css
+++ b/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.css
@@ -91,4 +91,28 @@ table {
.chip-in-progress {
background-color: #f5a623 !important;
color: white;
-}
\ No newline at end of file
+}
+
+.status-progress-flex {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+}
+
+button.cancel-button {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 5px;
+}
+
+.cancel-button {
+ color: red;
+ background-color: transparent;
+ border: none;
+ padding: 0;
+}
+
+.cancel-button mat-icon {
+ color: red;
+}
diff --git a/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.html b/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.html
index b52093c..f7ceea4 100644
--- a/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.html
+++ b/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.html
@@ -49,6 +49,7 @@
Pendiente de ejecutar
Ejecutando
Completado con éxito
+ Cancelado
@@ -63,7 +64,6 @@
-
@@ -73,31 +73,40 @@
-
- {{
- trace.status === 'failed' ? 'Fallido' :
- trace.status === 'in-progress' ? 'En ejecución' :
- trace.status === 'success' ? 'Finalizado con éxito' :
- trace.status === 'pending' ? 'Pendiente de ejecutar' :
- trace.status
- }}
-
+
+
+ {{
+ trace.status === 'failed' ? 'Fallido' :
+ trace.status === 'in-progress' ? 'En ejecución' :
+ trace.status === 'success' ? 'Finalizado con éxito' :
+ trace.status === 'pending' ? 'Pendiente de ejecutar' :
+ trace.status === 'cancelled' ? 'Cancelado' :
+ trace.status
+ }}
+
+
+
-
-
{{ column.cell(trace) }}
diff --git a/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.ts b/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.ts
index 2c9e24a..8637c6c 100644
--- a/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.ts
+++ b/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.ts
@@ -8,6 +8,8 @@ import { JoyrideService } from 'ngx-joyride';
import { MatDialog } from "@angular/material/dialog";
import { InputDialogComponent } from "./input-dialog/input-dialog.component";
import { ProgressBarMode, MatProgressBarModule } from '@angular/material/progress-bar';
+import {DeleteModalComponent} from "../../../../shared/delete_modal/delete-modal/delete-modal.component";
+import {ToastrService} from "ngx-toastr";
@Component({
selector: 'app-task-logs',
@@ -88,7 +90,8 @@ export class TaskLogsComponent implements OnInit {
constructor(private http: HttpClient,
private joyrideService: JoyrideService,
private dialog: MatDialog,
- private cdr: ChangeDetectorRef
+ private cdr: ChangeDetectorRef,
+ private toastService: ToastrService
) { }
ngOnInit(): void {
@@ -173,6 +176,26 @@ export class TaskLogsComponent implements OnInit {
});
}
+ cancelTrace(trace: any): void {
+ this.dialog.open(DeleteModalComponent, {
+ width: '300px',
+ data: { name: trace.jobId },
+ }).afterClosed().subscribe((result) => {
+ if (result) {
+ this.http.post(`${this.baseUrl}/traces/server/${trace.uuid}/cancel`, {}).subscribe({
+ next: () => {
+ this.toastService.success('Transmision de imagen cancelada');
+ this.loadTraces();
+ },
+ error: (error) => {
+ this.toastService.error(error.error['hydra:description']);
+ console.error(error.error['hydra:description']);
+ }
+ });
+ }
+ });
+ }
+
loadTraces(): void {
this.loading = true;
const url = `${this.baseUrl}/traces?page=${this.page + 1}&itemsPerPage=${this.itemsPerPage}`;
|