Merge branch 'develop' of ssh://ognproject.evlt.uma.es:21987/opengnsys/oggui into develop

2025-05-19 16:19:43 +02:00 · 2025-05-19 16:19:43 +02:00 · 35bb0e6e62
parent 76835be2a2 a6ce1ee4cf
commit 35bb0e6e62
6 changed files with 37 additions and 35 deletions
--- a/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.html
+++ b/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.html
@ -5,7 +5,7 @@
    </button>

    <div class="header-container-title">
-      <h2 joyrideStep="titleStep" text="{{ 'titleStepText' | translate }}">{{ 'adminCommandsTitle' |
+      <h2 joyrideStep="tracesTitleStep" text="{{ 'tracesTitleStepText' | translate }}">{{ 'adminCommandsTitle' |
        translate }}</h2>
    </div>

@ -17,7 +17,7 @@
    </div>
  </div>

-  <div class="search-container">
+  <div class="search-container" joyrideStep="filtersStep" text="{{ 'filtersStepText' | translate }}">
    <mat-form-field appearance="fill" class="search-select">
      <mat-label>{{ 'commandSelectStepText' | translate }}</mat-label>
      <mat-select (selectionChange)="onOptionCommandSelected($event.value)" #commandSearchInput>
@ -52,8 +52,8 @@
  <app-loading [isLoading]="loading"></app-loading>

  <div *ngIf="!loading">
-    <table mat-table [dataSource]="traces" class="mat-elevation-z8" joyrideStep="tableStep"
-      text="{{ 'tableStepText' | translate }}">
+    <table mat-table [dataSource]="traces" class="mat-elevation-z8" joyrideStep="tracesTableStep"
+      text="{{ 'tracesTableStepText' | translate }}">
      <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
        <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
        <td mat-cell *matCellDef="let trace">
@ -128,8 +128,8 @@
        </td>
      </ng-container>

-      <ng-container matColumnDef="actions" joyrideStep="actionsStep" text="{{ 'actionsStepText' | translate }}">
-        <th mat-header-cell *matHeaderCellDef style="text-align: center;">{{ 'columnActions' | translate }}</th>
+      <ng-container matColumnDef="actions">
+        <th mat-header-cell *matHeaderCellDef style="text-align: center;">{{ 'informationLabel' | translate }}</th>
        <td mat-cell *matCellDef="let trace" style="text-align: center;">
          <button mat-icon-button color="primary" [disabled]="!trace.input" (click)="openInputModal(trace.input)">
            <mat-icon>
--- a/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.ts
+++ b/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.ts
@ -134,7 +134,7 @@ export class ClientTaskLogsComponent implements OnInit {
  }

  onOptionCommandSelected(selectedCommand: any): void {
-    this.filters['command'] = selectedCommand.name;
+    this.filters['command'] = selectedCommand.id || selectedCommand.uuid;
    console.log('Comando seleccionado:', selectedCommand);
    console.log('Valor que se usará para el filtro:', selectedCommand.name);
    this.loadTraces();
@ -192,7 +192,7 @@ export class ClientTaskLogsComponent implements OnInit {
      .set('itemsPerPage', this.itemsPerPage.toString());

    if (this.filters['command']) {
-      params = params.set('command.name', this.filters['command']);
+      params = params.set('command.uuid', this.filters['command']);
    }

    if (this.filters['status']) {
@ -281,11 +281,10 @@ export class ClientTaskLogsComponent implements OnInit {
  iniciarTour(): void {
    this.joyrideService.startTour({
      steps: [
-        'titleStep',
+        'tracesTitleStep',
        'resetFiltersStep',
-        'clientSelectStep',
-        'commandSelectStep',
-        'tableStep',
+        'filtersStep',
+        'tracesTableStep',
        'paginationStep'
      ],
      showPrevButton: true,
--- a/ogWebconsole/src/app/components/task-logs/task-logs.component.html
+++ b/ogWebconsole/src/app/components/task-logs/task-logs.component.html
@ -4,7 +4,7 @@
  </button>

  <div class="header-container-title">
-    <h2 joyrideStep="titleStep" text="{{ 'titleStepText' | translate }}">{{ 'adminCommandsTitle' |
+    <h2 joyrideStep="tracesTitleStep" text="{{ 'tracesTitleStepText' | translate }}">{{ 'adminCommandsTitle' |
      translate }}</h2>
  </div>

@ -16,9 +16,8 @@
  </div>
 </div>

-<div class="search-container">
-  <mat-form-field appearance="fill" class="search-select" joyrideStep="clientSelectStep"
-    text="{{ 'clientSelectStepText' | translate }}">
+<div class="search-container" joyrideStep="filtersStep" text="{{ 'filtersStepText' | translate }}">
+  <mat-form-field appearance="fill" class="search-select">
    <input type="text" matInput [formControl]="clientControl" [matAutocomplete]="clientAuto" #commandClientInput
      placeholder="{{ 'filterClientPlaceholder' | translate }}">
    <mat-autocomplete #clientAuto="matAutocomplete" [displayWith]="displayFnClient"
@ -74,8 +73,8 @@
 <app-loading [isLoading]="loading"></app-loading>

 <div *ngIf="!loading">
-  <table mat-table [dataSource]="traces" class="mat-elevation-z8" joyrideStep="tableStep"
-    text="{{ 'tableStepText' | translate }}">
+  <table mat-table [dataSource]="traces" class="mat-elevation-z8" joyrideStep="tracesTableStep"
+    text="{{ 'tracesTableStepText' | translate }}">
    <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
      <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
      <td mat-cell *matCellDef="let trace">
@ -150,10 +149,11 @@
      </td>
    </ng-container>

-    <ng-container matColumnDef="actions" joyrideStep="actionsStep" text="{{ 'actionsStepText' | translate }}">
-      <th mat-header-cell *matHeaderCellDef style="text-align: center;">{{ 'columnActions' | translate }}</th>
+    <ng-container matColumnDef="actions">
+      <th mat-header-cell *matHeaderCellDef style="text-align: center;">{{ 'informationLabel' | translate }}</th>
      <td mat-cell *matCellDef="let trace" style="text-align: center;">
-        <button mat-icon-button color="primary" [disabled]="!trace.input || trace.input.length === 0" (click)="openInputModal(trace.input)">
+        <button mat-icon-button color="primary" [disabled]="!trace.input || trace.input.length === 0"
+          (click)="openInputModal(trace.input)">
          <mat-icon>
            <span class="material-symbols-outlined">
              mode_comment
--- a/ogWebconsole/src/app/components/task-logs/task-logs.component.ts
+++ b/ogWebconsole/src/app/components/task-logs/task-logs.component.ts
@ -323,11 +323,10 @@ export class TaskLogsComponent implements OnInit {
  iniciarTour(): void {
    this.joyrideService.startTour({
      steps: [
-        'titleStep',
+        'tracesTitleStep',
        'resetFiltersStep',
-        'clientSelectStep',
-        'commandSelectStep',
-        'tableStep',
+        'filtersStep',
+        'tracesTableStep',
        'paginationStep'
      ],
      showPrevButton: true,
--- a/ogWebconsole/src/locale/en.json
+++ b/ogWebconsole/src/locale/en.json
@ -80,7 +80,7 @@
  "searchGroupNameLabel": "Search group name",
  "loadingStepText": "Wait while the command groups are loading.",
  "viewCommands": "View commands",
-  "paginationStepText": "Navigate between command group pages using the paginator.",
+  "paginationStepText": "Navigate through pages using the paginator.",
  "commandGroupDetailsTitle": "Command Group Details",
  "createdBy": "Created by",
  "groupId": "Group ID",
@ -527,6 +527,8 @@
  "gitImage": "Git images",
  "gitImageStep": "Git images",
  "gitImageStepText": "On this screen you can manage git images.",
-  "partitions": "Particiones",
-  "isDefaultLabel": "Default"
+  "isDefaultLabel": "Default",
+  "tracesTitleStepText": "In this screen, you can see the execution traces of each client, with its id, command, real-time status, date and actions to be performed.",
+  "filtersStepText": "Here you can see the different filters to apply to the table information.",
+  "tracesTableStepText": "This is the table with the execution traces updated in real time."
 }
--- a/ogWebconsole/src/locale/es.json
+++ b/ogWebconsole/src/locale/es.json
@ -79,7 +79,7 @@
  "searchGroupNameLabel": "Buscar nombre de grupo",
  "loadingStepText": "Espera mientras se cargan los grupos de comandos.",
  "viewCommands": "Ver comandos",
-  "paginationStepText": "Navega entre las páginas de grupos de comandos usando el paginador.",
+  "paginationStepText": "Navega entre las páginas usando el paginador.",
  "commandGroupDetailsTitle": "Detalles del Grupo de Comandos",
  "createdBy": "Creado por",
  "groupId": "ID del Grupo",
@ -530,6 +530,8 @@
  "monolithicImage": "Imagenes monolíticas",
  "gitImage": "Imágenes Git",
  "gitImageStepText": "Esta opción permite visualizar las imágenes Git disponibles en el servidor.",
-  "partitions": "Particiones",
-  "isDefaultLabel": "Por defecto"
+  "isDefaultLabel": "Por defecto",
+  "tracesTitleStepText": "En esta pantalla, puedes ver las trazas de ejecución de cada cliente, con su id, comando, estado en tiempo real, fecha y acciones a realizar.",
+  "filtersStepText": "Aquí puedes ver los diferentes filtros que aplicar a la información de la tabla.",
+  "tracesTableStepText": "Esta es la tabla con las trazas de ejecución actualizadas en tiempo real."
 }