diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bb413f..23680f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [1.3.3] - 2026-04-13 +### Improved +- Mejorada la visualizacion del selector de particiones mostrando el contenido de cache y la imagen asociada a la partición. +- Mejorada usabilidad de la funcion updateCache para que no haga falta elegir disco y particion para lanzar el comando. + ## [1.3.2] - 2026-04-13 ### Added - Añadida opción para restaurar sólo cache o cache y particion. diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html b/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html index b1c6d89..7258ff2 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html @@ -302,36 +302,57 @@ - -
-
- storage - Selección de partición -
- -
-
- - - Instrucciones generadas - - - - 
{{ ogInstructions }}
- - + + @if (deployMode !== 'update-cache') { +
+
+ storage + Selección de partición
- - +
+ @if (showInstructions) { + + + Instrucciones generadas + + + + 
{{ ogInstructions }}
+ + + } + + + +
-
+ } + + + @if (deployMode === 'update-cache') { +
+
+ info + Estado actual de particiones +
+
+ + +
+
+ }
(); @@ -58,7 +58,7 @@ export class DeployImageComponent implements OnInit{ selectedClients: any[] = []; selectedModelClient: any = null; filteredPartitions: any[] = []; - + selectedRepository: any = null; imageType: string = 'monolithic'; @@ -127,9 +127,9 @@ export class DeployImageComponent implements OnInit{ } }); this.clientId = this.clientData?.length ? this.clientData[0]['@id'] : null; - this.clientData.forEach((client: { selected: boolean; status: string}) => { client.selected = true; }); - this.selectedClients = this.clientData.filter((client: { selected: boolean; status: string}) => client.selected); - this.selectedModelClient = this.clientData.find((client: { selected: boolean; status: string}) => client.selected) || null; + this.clientData.forEach((client: { selected: boolean; status: string }) => { client.selected = true; }); + this.selectedClients = this.clientData.filter((client: { selected: boolean; status: string }) => client.selected); + this.selectedModelClient = this.clientData.find((client: { selected: boolean; status: string }) => client.selected) || null; if (this.selectedModelClient) { this.loadPartitions(this.selectedModelClient); @@ -202,7 +202,7 @@ export class DeployImageComponent implements OnInit{ } return client.partitions - .map((p: { partitionNumber: any; size: any; filesystem: any }) => `#${p.partitionNumber} ${p.filesystem} - ${p.size / 1024 }GB`) + .map((p: { partitionNumber: any; size: any; filesystem: any }) => `#${p.partitionNumber} ${p.filesystem} - ${p.size / 1024}GB`) .join('\n'); } @@ -273,17 +273,18 @@ export class DeployImageComponent implements OnInit{ } } this.errorMessage = ""; - + if (this.selectedMethod) { setTimeout(() => { this.scrollToPartitionSection(); }, 300); } - + return true; } save(): void { + const needsPartition = this.deployMode !== 'update-cache'; if (!this.selectedClients.length) { this.toastService.error('Debe seleccionar al menos un cliente'); @@ -300,7 +301,7 @@ export class DeployImageComponent implements OnInit{ return; } - if (!this.selectedPartition) { + if (needsPartition && !this.selectedPartition) { this.toastService.error('Debe seleccionar una partición'); return; } @@ -322,15 +323,15 @@ export class DeployImageComponent implements OnInit{ dialogRef.afterClosed().subscribe(result => { if (result !== undefined) { this.loading = true; - + let payload: any; let url: string; if (this.imageType === 'git') { payload = { type: 'git', - diskNumber: this.selectedPartition.diskNumber, - partitionNumber: this.selectedPartition.partitionNumber, + diskNumber: this.selectedPartition?.diskNumber || 1, + partitionNumber: this.selectedPartition?.partitionNumber || 1, repositoryName: this.selectedGitRepository, branch: this.selectedBranch, hexsha: this.selectedCommit.hexsha, @@ -342,8 +343,8 @@ export class DeployImageComponent implements OnInit{ } else { payload = { method: this.selectedMethod, - diskNumber: this.selectedPartition.diskNumber, - partitionNumber: this.selectedPartition.partitionNumber, + diskNumber: this.selectedPartition?.diskNumber || 1, + partitionNumber: this.selectedPartition?.partitionNumber || 1, p2pMode: this.p2pMode, p2pTime: this.p2pMode === 'seeder' ? this.p2pTime : 0, mcastIp: this.mcastIp, @@ -386,7 +387,8 @@ export class DeployImageComponent implements OnInit{ } isFormValid(): boolean { - if (!this.allSelected || !this.selectedModelClient || !this.selectedPartition) { + const needsPartition = this.deployMode !== 'update-cache'; + if (!this.allSelected || !this.selectedModelClient || (needsPartition && !this.selectedPartition)) { return false; } @@ -422,21 +424,21 @@ export class DeployImageComponent implements OnInit{ isDirectMethod(): boolean { return this.selectedMethod === 'unicast-direct' || - this.selectedMethod === 'udpcast-direct'; + this.selectedMethod === 'udpcast-direct'; } openScheduleModal(): void { let scope = this.runScriptContext?.type || 'clients'; let selectedClients = null; - + if (this.selectedClients.length === 0 && this.clientData.length > 0) { this.updateSelectedClients(); } - - const isOrganizationalContext = this.runScriptContext?.type && + + const isOrganizationalContext = this.runScriptContext?.type && ['organizational-unit', 'classroom', 'classrooms-group', 'clients-group'].includes(this.runScriptContext.type); - + if (!isOrganizationalContext && this.selectedClients && this.selectedClients.length > 0) { scope = 'clients'; selectedClients = this.selectedClients; @@ -449,7 +451,7 @@ export class DeployImageComponent implements OnInit{ width: '800px', data: { scope: scope, - selectedClients: selectedClients, + selectedClients: selectedClients, organizationalUnit: this.runScriptContext?.['@id'], source: 'assistant', runScriptContext: this.runScriptContext @@ -458,10 +460,11 @@ export class DeployImageComponent implements OnInit{ dialogRef.afterClosed().subscribe((result: { [x: string]: any; }) => { if (result) { + // Si es un updateCache no hay que indicar disco ni partición, se envían a 1 ambas const basePayload: any = { method: this.selectedMethod, - diskNumber: this.selectedPartition.diskNumber, - partitionNumber: this.selectedPartition.partitionNumber, + diskNumber: this.selectedPartition?.diskNumber || 1, + partitionNumber: this.selectedPartition?.partitionNumber || 1, imageName: this.selectedImage.name, imageUuid: this.selectedImage.uuid, type: this.imageType, @@ -519,27 +522,27 @@ export class DeployImageComponent implements OnInit{ generateOgInstructions() { this.showInstructions = true; - this.ogInstructions = `og-deploy-image --image ${this.selectedImage.name} --partition ${this.selectedPartition.partitionNumber} --method ${this.selectedMethod}`; + this.ogInstructions = `og-deploy-image --image ${this.selectedImage.name} --partition ${this.selectedPartition?.partitionNumber || 1} --method ${this.selectedMethod}`; } - scrollToPartitionSection() { - const partitionSection = document.getElementById('partition-selection'); + scrollToPartitionSection() { + const partitionSection = document.getElementById('partition-selection'); if (partitionSection) { - partitionSection.scrollIntoView({ - behavior: 'smooth', - block: 'start' + partitionSection.scrollIntoView({ + behavior: 'smooth', + block: 'start' }); console.log('Scroll ejecutado'); } } - scrollToAdvancedOptions() { + scrollToAdvancedOptions() { const advancedOptions = document.getElementById('advanced-options'); - + if (advancedOptions) { - advancedOptions.scrollIntoView({ - behavior: 'smooth', - block: 'start' + advancedOptions.scrollIntoView({ + behavior: 'smooth', + block: 'start' }); console.log('Scroll hacia opciones avanzadas ejecutado'); } @@ -621,7 +624,7 @@ export class DeployImageComponent implements OnInit{ this.loadingCommits = false; this.filterCommits(); if (this.filteredCommits.length > 0) { - this.selectedCommit = this.filteredCommits.reduce((a, b) => + this.selectedCommit = this.filteredCommits.reduce((a, b) => new Date(a.committed_date * 1000) > new Date(b.committed_date * 1000) ? a : b ); } @@ -635,7 +638,7 @@ export class DeployImageComponent implements OnInit{ filterCommits() { if (this.showOnlyTagged) { - this.filteredCommits = this.commits.filter(commit => + this.filteredCommits = this.commits.filter(commit => commit.tags && commit.tags.length > 0 ); } else { @@ -646,7 +649,7 @@ export class DeployImageComponent implements OnInit{ onTagFilterChange() { this.filterCommits(); if (this.filteredCommits.length > 0 && !this.filteredCommits.includes(this.selectedCommit)) { - this.selectedCommit = this.filteredCommits.reduce((a, b) => + this.selectedCommit = this.filteredCommits.reduce((a, b) => new Date(a.committed_date * 1000) > new Date(b.committed_date * 1000) ? a : b ); } diff --git a/ogWebconsole/src/app/components/groups/shared/disk-partition-selector/disk-partition-selector.component.css b/ogWebconsole/src/app/components/groups/shared/disk-partition-selector/disk-partition-selector.component.css index aa3c38d..a0d98c9 100644 --- a/ogWebconsole/src/app/components/groups/shared/disk-partition-selector/disk-partition-selector.component.css +++ b/ogWebconsole/src/app/components/groups/shared/disk-partition-selector/disk-partition-selector.component.css @@ -49,3 +49,32 @@ box-shadow: none !important; border: none !important; } + +/* OS Column Classes */ +.os-col-wrapper { + display: flex; + flex-direction: column; +} + +.cache-title { + font-weight: bold; + font-size: 0.8rem; + color: #666; +} + +.cache-item { + font-size: 0.75rem; + color: #666; +} + +.image-name { + font-size: 0.75rem; + color: gray; +} + +.image-date { + font-size: 0.75rem; + color: #555; + font-style: italic; + margin-top: 2px; +} \ No newline at end of file diff --git a/ogWebconsole/src/app/components/groups/shared/disk-partition-selector/disk-partition-selector.component.html b/ogWebconsole/src/app/components/groups/shared/disk-partition-selector/disk-partition-selector.component.html index 899e6c7..2a49b55 100644 --- a/ogWebconsole/src/app/components/groups/shared/disk-partition-selector/disk-partition-selector.component.html +++ b/ogWebconsole/src/app/components/groups/shared/disk-partition-selector/disk-partition-selector.component.html @@ -1,53 +1,71 @@
@for (disk of diskUsageData; track disk.diskNumber) { -
- -
-

Disco {{ disk.diskNumber }}

-
- -
-
- - - - - - +
+ +
+

Disco {{ disk.diskNumber }}

+
- @for (column of columns; track column.columnDef) { - -
- - - } +
+
+
Seleccionar - - - - {{ column.header }} - @if (column.columnDef === 'size') { -
- {{ partition.size }} MB - {{ partition.size / 1024 | number:'1.0-2' }} GB -
- } @else { - {{ column.cell ? column.cell(partition) : partition[column.columnDef] }} - } -
- - - -
-
+ + Seleccionar + + + + + + + + @for (column of columns; track column.columnDef) { + + {{ column.header }} + + @if (column.columnDef === 'size') { +
+ {{ partition.size }} MB + {{ partition.size / 1024 | number:'1.0-2' }} GB +
+ } + @else if (column.columnDef === 'operativeSystem') { +
+ @if (partition.filesystem === 'CACHE' && partition.cacheContent) { + Contenido: + @for (item of parseCacheContent(partition.cacheContent); track item.name) { +
+ • {{ item.name }} ({{ item.size }}) +
+ } + } + @if (partition.filesystem !== 'CACHE' || !partition.cacheContent) { + {{partition.operativeSystem?.name }} + {{ partition.image?.name }} + @if (partition.deployDate) { + Desplegada: {{ partition.deployDate | date:'dd/MM/yyyy HH:mm' + }} + } + } +
+ } + + @else { + {{ column.cell ? column.cell(partition) : partition[column.columnDef] }} + } + + + } + + + + +
- -
+
+ +
} - + \ No newline at end of file diff --git a/ogWebconsole/src/app/components/groups/shared/disk-partition-selector/disk-partition-selector.component.ts b/ogWebconsole/src/app/components/groups/shared/disk-partition-selector/disk-partition-selector.component.ts index a3bb8ad..493c7d6 100644 --- a/ogWebconsole/src/app/components/groups/shared/disk-partition-selector/disk-partition-selector.component.ts +++ b/ogWebconsole/src/app/components/groups/shared/disk-partition-selector/disk-partition-selector.component.ts @@ -18,7 +18,8 @@ export class DiskPartitionSelectorComponent implements OnChanges { @Input() displayedColumns: string[] = []; @Input() selectedPartition: any; @Input() disableCondition: (row: any) => boolean = () => false; - + @Input() readonly: boolean = false; + @Output() selectedPartitionChange = new EventEmitter(); diskUsageData: any[] = []; @@ -55,4 +56,12 @@ export class DiskPartitionSelectorComponent implements OnChanges { this.selectedPartitionChange.emit(this.selectedPartition); } } + parseCacheContent(content: string): { name: string, size: string }[] { + if (!content) return []; + return content.split(',').map(item => { + const [name, bytes] = item.split(':'); + const sizeMB = (parseInt(bytes) / (1024 * 1024)).toFixed(2) + ' MB'; + return { name, size: sizeMB }; + }); + } }