- | {{ column.header }} |
-
-
-
- {{ column.cell(schedule) }}
-
-
+
-
-
-
-
-
+
+ | {{ 'executionOrder' | translate }} |
+
+
+ {{ item.order }}
+
+ |
+
-
- {{ column.cell(schedule) }}
-
+
+ {{ 'actionType' | translate }} |
+
+
+ {{ getTypeDisplay(item.type).icon }}
+ {{ getTypeDisplay(item.type).label }}
+
+ |
+
+
+
+ {{ 'scriptLabel' | translate }} |
+
+
+ {{ item.content }}
+
+
+ ({{ 'viewParameters' | translate }})
+
+ |
+
+
+
+ {{ 'viewParameters' | translate }} |
+
+
+ —
|
- Acciones |
-
- |
-
+
@@ -74,5 +92,5 @@
-
+
diff --git a/ogWebconsole/src/app/components/commands/commands-task/show-task-script/show-task-script.component.ts b/ogWebconsole/src/app/components/commands/commands-task/show-task-script/show-task-script.component.ts
index 9be4dc7..7622307 100644
--- a/ogWebconsole/src/app/components/commands/commands-task/show-task-script/show-task-script.component.ts
+++ b/ogWebconsole/src/app/components/commands/commands-task/show-task-script/show-task-script.component.ts
@@ -25,14 +25,31 @@ export class ShowTaskScriptComponent implements OnInit{
filters: { [key: string]: string } = {};
columns = [
- { columnDef: 'id', header: 'ID', cell: (client: any) => client.id },
- { columnDef: 'order', header: 'Orden', cell: (client: any) => client.order },
- { columnDef: 'content', header: 'Script', cell: (client: any) => client.content },
- { columnDef: 'type', header: 'Tipo', cell: (client: any) => client.type },
- { columnDef: 'parameters', header: 'Parámetros', cell: (client: any) => client.parameters },
+ { columnDef: 'id', header: 'ID', cell: (item: any) => item.id },
+ { columnDef: 'order', header: 'Orden', cell: (item: any) => item.order },
+ { columnDef: 'type', header: 'Tipo', cell: (item: any) => item.type },
+ { columnDef: 'parameters', header: 'Parámetros', cell: (item: any) => item.parameters },
+ { columnDef: 'content', header: 'Contenido', cell: (item: any) => item.content },
];
- displayedColumns: string[] = ['id', 'order', 'type', 'parameters', 'content', 'actions'];
+ displayedColumns: string[] = ['order', 'type', 'content', 'parameters', 'actions'];
+
+ typeLabels: { [key: string]: { label: string, icon: string } } = {
+ 'partition-and-format': { label: 'Particionar y formatear', icon: 'storage' },
+ 'partition-assistant': { label: 'Asistente de particionado', icon: 'storage' },
+ 'deploy-image': { label: 'Desplegar imagen', icon: 'cloud_download' },
+ 'create-image': { label: 'Crear imagen', icon: 'cloud_upload' },
+ 'run-script': { label: 'Ejecutar script', icon: 'code' },
+ 'reboot': { label: 'Reiniciar', icon: 'restart_alt' },
+ 'shutdown': { label: 'Apagar', icon: 'power_off' },
+ 'poweron': { label: 'Encender', icon: 'power' },
+ 'power-on': { label: 'Encender', icon: 'power' },
+ 'login': { label: 'Iniciar sesión', icon: 'login' },
+ };
+
+ getTypeDisplay(type: string): { label: string, icon: string } {
+ return this.typeLabels[type] || { label: type, icon: 'play_arrow' };
+ }
constructor(
private toastService: ToastrService,
@@ -53,9 +70,11 @@ export class ShowTaskScriptComponent implements OnInit{
loadData() {
this.loading = true;
- this.http.get (`${this.baseUrl}/command-task-scripts?page=${this.page + 1}&itemsPerPage=${this.itemsPerPage}&commandTask.id=${this.data.commandTask?.id}`, { params: this.filters }).subscribe(
+ this.http.get(`${this.baseUrl}/command-task-scripts?page=${this.page + 1}&itemsPerPage=${this.itemsPerPage}&commandTask.id=${this.data.commandTask?.id}&order[order]=ASC`, { params: this.filters }).subscribe(
(data) => {
- this.dataSource.data = data['hydra:member'];
+ const items = data['hydra:member'];
+ items.sort((a: any, b: any) => (a.order ?? 0) - (b.order ?? 0));
+ this.dataSource.data = items;
this.length = data['hydra:totalItems'];
this.loading = false;
},
diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.css b/ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.css
index cf41b39..2154a9a 100644
--- a/ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.css
+++ b/ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.css
@@ -10,6 +10,26 @@
align-items: center;
}
+/* Layout compacto: tipo + configuración en una fila */
+.compact-config-row {
+ display: flex;
+ gap: 20px;
+ margin-bottom: 20px;
+}
+
+.compact-section {
+ padding: 20px !important;
+ margin-bottom: 0 !important;
+}
+
+.type-section {
+ flex: 0 0 280px;
+}
+
+.config-section {
+ flex: 1;
+}
+
/* Secciones del formulario */
.form-section {
background: white !important;
@@ -249,6 +269,14 @@ mat-form-field {
/* Responsive design */
@media (max-width: 768px) {
+ .compact-config-row {
+ flex-direction: column;
+ }
+
+ .type-section {
+ flex: none;
+ }
+
.select-container {
padding: 16px;
}
@@ -879,8 +907,8 @@ mat-form-field {
.git-info-grid {
display: grid;
- grid-template-columns: 1fr 1fr 1fr;
- gap: 16px;
+ grid-template-columns: 1fr;
+ gap: 12px;
}
.git-info-item {
diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.html b/ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.html
index e2e79a6..e118657 100644
--- a/ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.html
+++ b/ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.html
@@ -33,14 +33,13 @@
|