+
+
+
+
+
+
+
+
diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.ts b/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.ts
index 5ebe993..5e655bb 100644
--- a/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.ts
+++ b/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.ts
@@ -7,6 +7,7 @@ import { ActivatedRoute, Router } from "@angular/router";
import { ConfigService } from '@services/config.service';
import {CreateTaskComponent} from "../../../../commands/commands-task/create-task/create-task.component";
import {MatDialog} from "@angular/material/dialog";
+import {QueueConfirmationModalComponent} from "../../../../../shared/queue-confirmation-modal/queue-confirmation-modal.component";
@Component({
selector: 'app-deploy-image',
@@ -23,7 +24,7 @@ export class DeployImageComponent implements OnInit{
images: any[] = [];
selectedImage: any = null;
selectedMethod: string | null = null;
- selectedPartition: any = null;
+ private _selectedPartition: any = null;
mcastIp: string = '';
mcastPort: Number = 0;
mcastMode: string = '';
@@ -40,6 +41,8 @@ export class DeployImageComponent implements OnInit{
ogInstructions: string = '';
deployImage: boolean = true;
showInstructions: boolean = false;
+ loadingCommits: boolean = false;
+ selectedGitRepository: string = '';
protected p2pModeOptions = [
{ name: 'Leecher', value: 'leecher' },
@@ -97,6 +100,15 @@ export class DeployImageComponent implements OnInit{
displayedColumns = ['select', ...this.columns.map(column => column.columnDef)];
selection = new SelectionModel(true, []);
+ repositories: string[] = [];
+ loadingRepositories: boolean = false;
+ branches: string[] = [];
+ selectedBranch: string = '';
+ loadingBranches: boolean = false;
+ commits: any[] = [];
+ selectedCommit: any = null;
+ private initialGitLoad = true;
+
constructor(
private http: HttpClient,
private toastService: ToastrService,
@@ -115,18 +127,11 @@ export class DeployImageComponent implements OnInit{
}
});
this.clientId = this.clientData?.length ? this.clientData[0]['@id'] : null;
- this.clientData.forEach((client: { selected: boolean; status: string}) => {
- if (client.status === 'og-live') {
- client.selected = true;
- }
- });
- this.selectedClients = this.clientData.filter(
- (client: { status: string }) => client.status === 'og-live'
- );
+ this.clientData.forEach((client: { selected: boolean; status: string}) => { client.selected = true; });
- this.selectedModelClient = this.clientData.find(
- (client: { status: string }) => client.status === 'og-live'
- ) || null;
+ 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);
@@ -141,7 +146,14 @@ export class DeployImageComponent implements OnInit{
onImageTypeSelected(event: any) {
this.imageType = event;
+ if (event === 'git') {
+ this.selectedMethod = null;
+ this.loadGitRepositories();
+ }
this.loadImages();
+ setTimeout(() => {
+ this.scrollToPartitionSection();
+ }, 200);
}
get runScriptTitle(): string {
@@ -211,7 +223,7 @@ export class DeployImageComponent implements OnInit{
this.loadImages();
},
(error) => {
- console.error('Error al cargar los datos completos del cliente:', error);
+ console.error('Error al cargar las particiones:', error);
}
);
} else {
@@ -223,11 +235,7 @@ export class DeployImageComponent implements OnInit{
toggleSelectAll() {
this.allSelected = !this.allSelected;
- this.clientData.forEach((client: { selected: boolean; status: string }) => {
- if (client.status === "og-live") {
- client.selected = this.allSelected;
- }
- });
+ this.clientData.forEach((client: { selected: boolean; status: string }) => { client.selected = this.allSelected; });
}
loadImages() {
@@ -265,90 +273,143 @@ export class DeployImageComponent implements OnInit{
}
}
this.errorMessage = "";
+
+ if (this.selectedMethod) {
+ setTimeout(() => {
+ this.scrollToPartitionSection();
+ }, 300);
+ }
+
return true;
}
save(): void {
- this.loading = true;
-
if (!this.selectedClients.length) {
this.toastService.error('Debe seleccionar al menos un cliente');
- this.loading = false;
return;
}
- if (!this.selectedImage) {
+ if (!this.selectedImage && this.imageType !== 'git') {
this.toastService.error('Debe seleccionar una imagen');
- this.loading = false;
return;
}
- if (!this.selectedMethod) {
+ if (!this.selectedMethod && this.imageType !== 'git') {
this.toastService.error('Debe seleccionar un método');
- this.loading = false;
return;
}
if (!this.selectedPartition) {
this.toastService.error('Debe seleccionar una partición');
- this.loading = false;
return;
}
+ if (this.imageType === 'git' && !this.selectedCommit) {
+ this.toastService.error('Debe seleccionar un commit');
+ return;
+ }
+
+ const dialogRef = this.dialog.open(QueueConfirmationModalComponent, {
+ width: '400px',
+ disableClose: true,
+ hasBackdrop: true,
+ backdropClass: 'non-clickable-backdrop'
+ });
+
this.toastService.info('Preparando petición de despliegue');
- const payload = {
- clients: this.selectedClients.map((client: any) => client.uuid),
- method: this.selectedMethod,
- // partition: this.selectedPartition['@id'],
- diskNumber: this.selectedPartition.diskNumber,
- partitionNumber: this.selectedPartition.partitionNumber,
- p2pMode: this.p2pMode,
- p2pTime: this.p2pTime,
- mcastIp: this.mcastIp,
- mcastPort: this.mcastPort,
- mcastMode: this.mcastMode,
- mcastSpeed: this.mcastSpeed,
- maxTime: this.mcastMaxTime,
- maxClients: this.mcastMaxClients,
- };
+ dialogRef.afterClosed().subscribe(result => {
+ if (result !== undefined) {
+ this.loading = true;
+
+ let payload: any;
+ let url: string;
- this.http.post(`${this.baseUrl}/image-image-repositories/${this.selectedImage.uuid}/deploy-image`, payload)
- .subscribe({
- next: (response) => {
- this.toastService.success('Petición de despliegue enviada correctamente');
- this.loading = false;
- this.router.navigate(['/commands-logs']);
- },
- error: (error) => {
- this.toastService.error(error.error['hydra:description'], 'Se ha detectado un error en el despliegue de imágenes.', {
- "closeButton": true,
- "newestOnTop": false,
- "progressBar": false,
- "positionClass": "toast-bottom-right",
- "timeOut": 0,
- "extendedTimeOut": 0,
- "tapToDismiss": false
- });
- this.loading = false;
+ if (this.imageType === 'git') {
+ payload = {
+ type: 'git',
+ clients: this.selectedClients.map((client: any) => client.uuid),
+ diskNumber: this.selectedPartition.diskNumber,
+ partitionNumber: this.selectedPartition.partitionNumber,
+ repositoryName: this.selectedGitRepository,
+ branch: this.selectedBranch,
+ hexsha: this.selectedCommit.hexsha,
+ queue: result
+ };
+ url = `${this.baseUrl}/git-repositories/deploy-image`;
+ } else {
+ payload = {
+ clients: this.selectedClients.map((client: any) => client.uuid),
+ method: this.selectedMethod,
+ diskNumber: this.selectedPartition.diskNumber,
+ partitionNumber: this.selectedPartition.partitionNumber,
+ p2pMode: this.p2pMode,
+ p2pTime: this.p2pMode === 'seeder' ? this.p2pTime : null,
+ mcastIp: this.mcastIp,
+ mcastPort: this.mcastPort,
+ mcastMode: this.mcastMode,
+ mcastSpeed: this.mcastSpeed,
+ maxTime: this.mcastMaxTime,
+ maxClients: this.mcastMaxClients,
+ type: this.imageType,
+ queue: result
+ };
+ url = `${this.baseUrl}/image-image-repositories/${this.selectedImage.uuid}/deploy-image`;
}
- });
+
+ this.http.post(url, payload)
+ .subscribe({
+ next: (response) => {
+ this.toastService.success('Petición de despliegue enviada correctamente');
+ this.loading = false;
+ this.router.navigate(['/commands-logs']);
+ },
+ error: (error) => {
+ this.toastService.error(error.error['hydra:description'], 'Se ha detectado un error en el despliegue de imágenes.', {
+ "closeButton": true,
+ "newestOnTop": false,
+ "progressBar": false,
+ "positionClass": "toast-bottom-right",
+ "timeOut": 0,
+ "extendedTimeOut": 0,
+ "tapToDismiss": false
+ });
+ this.loading = false;
+ }
+ });
+ }
+ });
}
isFormValid(): boolean {
- if (!this.allSelected || !this.selectedModelClient || !this.selectedImage || !this.selectedMethod || !this.selectedPartition) {
+ if (!this.allSelected || !this.selectedModelClient || !this.selectedPartition) {
return false;
}
- if (this.isMethod('udpcast') || this.isMethod('uftp') || this.isMethod('udpcast-direct')) {
- if (!this.mcastPort || !this.mcastIp || !this.mcastMode || !this.mcastSpeed || !this.mcastMaxClients || !this.mcastMaxTime) {
+ if (this.imageType === 'git') {
+ if (!this.selectedCommit) {
return false;
}
}
- if (this.isMethod('p2p')) {
- if (!this.p2pMode || !this.p2pTime) {
- return false;
+ if (this.imageType !== 'git' && !this.selectedMethod) {
+ return false;
+ }
+
+ if (this.imageType !== 'git') {
+ if (this.isMethod('udpcast') || this.isMethod('uftp') || this.isMethod('udpcast-direct')) {
+ if (!this.mcastPort || !this.mcastIp || !this.mcastMode || !this.mcastSpeed || !this.mcastMaxClients || !this.mcastMaxTime) {
+ return false;
+ }
+ }
+
+ if (this.isMethod('p2p')) {
+ if (!this.p2pMode) {
+ return false;
+ }
+ if (this.p2pMode === 'seeder' && !this.p2pTime) {
+ return false;
+ }
}
}
@@ -372,14 +433,14 @@ export class DeployImageComponent implements OnInit{
method: this.selectedMethod,
diskNumber: this.selectedPartition.diskNumber,
partitionNumber: this.selectedPartition.partitionNumber,
- p2pMode: this.selectedMethod === 'torrent' ? this.p2pMode : null,
- p2pTime: this.selectedMethod === 'torrent' ? this.p2pTime : null,
- mcastIp: this.selectedMethod === 'multicast' ? this.mcastIp : null,
- mcastPort: this.selectedMethod === 'multicast' ? this.mcastPort : null,
- mcastMode: this.selectedMethod === 'multicast' ? this.mcastMode : null,
- mcastSpeed: this.selectedMethod === 'multicast' ? this.mcastSpeed : null,
- maxTime: this.selectedMethod === 'multicast' ? this.mcastMaxTime : null,
- maxClients: this.selectedMethod === 'multicast' ? this.mcastMaxClients : null,
+ p2pMode: this.selectedMethod === 'p2p' ? this.p2pMode : null,
+ p2pTime: this.selectedMethod === 'p2p' && this.p2pMode === 'seeder' ? this.p2pTime : null,
+ mcastIp: this.selectedMethod === 'udpcast' ? this.mcastIp : null,
+ mcastPort: this.selectedMethod === 'udpcast' ? this.mcastPort : null,
+ mcastMode: this.selectedMethod === 'udpcast' ? this.mcastMode : null,
+ mcastSpeed: this.selectedMethod === 'udpcast' ? this.mcastSpeed : null,
+ maxTime: this.selectedMethod === 'udpcast' ? this.mcastMaxTime : null,
+ maxClients: this.selectedMethod === 'udpcast' ? this.mcastMaxClients : null,
};
this.http.post(`${this.baseUrl}/command-task-scripts`, {
@@ -400,37 +461,108 @@ export class DeployImageComponent implements OnInit{
}
generateOgInstructions() {
- let script = '';
- const disk = this.selectedPartition?.disk;
- const partition = this.selectedPartition?.partition;
+ this.showInstructions = true;
+ this.ogInstructions = `og-deploy-image --image ${this.selectedImage.name} --partition ${this.selectedPartition.partitionNumber} --method ${this.selectedMethod}`;
+ }
- let ip = this.selectedImage?.repository?.ip || 'REPO';
- let imgName = this.selectedImage?.canonicalName || '';
- let target = ` ${disk} ${partition}`;
- let log = `ogEcho log session "[0] $MSG_SCRIPTS_TASK_START `;
-
- if (this.deployImage) {
- script = 'deployImage ';
- } else {
- script = 'updateCache ';
- imgName += '.img';
- target = '';
+ scrollToPartitionSection() {
+ const partitionSection = document.getElementById('partition-selection');
+ if (partitionSection) {
+ partitionSection.scrollIntoView({
+ behavior: 'smooth',
+ block: 'start'
+ });
+ console.log('Scroll ejecutado');
}
+ }
- script += `${ip} /${imgName}${target} ${this.selectedMethod}`;
- log += `${script}"\n`;
- script = log + script;
-
- let params = '';
- if (['udpcast', 'uftp', 'udpcast-direct'].includes(
this.selectedMethod)) {
- params = `${this.mcastPort}:${this.mcastMode}:${this.mcastIp}:${this.mcastSpeed}M:${this.mcastMaxClients}:${this.mcastMaxTime}`;
- } else if (this.selectedMethod === 'p2p') {
- params = `${this.p2pMode}:${this.p2pTime}`;
+ scrollToAdvancedOptions() {
+ const advancedOptions = document.getElementById('advanced-options');
+
+ if (advancedOptions) {
+ advancedOptions.scrollIntoView({
+ behavior: 'smooth',
+ block: 'start'
+ });
+ console.log('Scroll hacia opciones avanzadas ejecutado');
}
+ }
- script += ` ${params}`;
+ get selectedPartition(): any {
+ return this._selectedPartition;
+ }
- this.ogInstructions = script;
- this.showInstructions = true
+ set selectedPartition(value: any) {
+ this._selectedPartition = value;
+ }
+
+ loadGitRepositories() {
+ this.loadingRepositories = true;
+ this.http.get(`${this.baseUrl}/image-repositories/server/git/${this.selectedRepository?.uuid}/get-collection`).subscribe(
+ data => {
+ this.repositories = data.repositories || [];
+ this.loadingRepositories = false;
+ if (this.repositories.length > 0) {
+ this.selectedGitRepository = this.repositories[0];
+ this.loadGitBranches();
+ }
+ },
+ error => {
+ this.toastService.error('Error al cargar los repositorios git');
+ this.loadingRepositories = false;
+ }
+ );
+ }
+
+ onGitRepositoryChange(event: any) {
+ this.selectedGitRepository = event;
+ this.selectedBranch = '';
+ this.branches = [];
+ this.commits = [];
+ this.selectedCommit = null;
+ this.loadGitBranches();
+ }
+
+ loadGitBranches() {
+ if (!this.selectedGitRepository) return;
+ this.loadingBranches = true;
+ this.http.post(`${this.baseUrl}/image-repositories/server/git/${this.selectedRepository?.uuid}/branches`, { repositoryName: this.selectedGitRepository }).subscribe(
+ data => {
+ this.branches = data.branches || [];
+ this.loadingBranches = false;
+ if (this.branches.length > 0) {
+ this.selectedBranch = this.branches[0];
+ this.loadGitCommits();
+ }
+ },
+ error => {
+ this.toastService.error('Error al cargar las ramas');
+ this.loadingBranches = false;
+ }
+ );
+ }
+
+ onGitBranchChange() {
+ this.selectedCommit = null;
+ this.commits = [];
+ this.loadGitCommits();
+ }
+
+ loadGitCommits() {
+ if (!this.selectedGitRepository || !this.selectedBranch) return;
+ this.loadingCommits = true;
+ this.http.post(`${this.baseUrl}/image-repositories/server/git/${this.selectedRepository?.uuid}/commits`, {
+ repositoryName: this.selectedGitRepository,
+ branch: this.selectedBranch
+ }).subscribe(
+ data => {
+ this.commits = data.commits || [];
+ this.loadingCommits = false;
+ },
+ error => {
+ this.toastService.error('Error al cargar los commits');
+ this.loadingCommits = false;
+ }
+ );
}
}
diff --git a/ogWebconsole/src/app/components/repositories/repositories.component.html b/ogWebconsole/src/app/components/repositories/repositories.component.html
index e5a9239..ab330e5 100644
--- a/ogWebconsole/src/app/components/repositories/repositories.component.html
+++ b/ogWebconsole/src/app/components/repositories/repositories.component.html
@@ -51,7 +51,6 @@
(click)="openShowMonoliticImagesDialog(repository)">
{{ 'monolithicImage' | translate }}
-
+
diff --git a/ogWebconsole/src/app/components/repositories/repositories.component.ts b/ogWebconsole/src/app/components/repositories/repositories.component.ts
index 1c2dd73..82b5338 100644
--- a/ogWebconsole/src/app/components/repositories/repositories.component.ts
+++ b/ogWebconsole/src/app/components/repositories/repositories.component.ts
@@ -10,7 +10,7 @@ import { Router } from '@angular/router';
import { ConfigService } from '@services/config.service';
import {Subnet} from "../ogdhcp/og-dhcp-subnets.component";
import {ShowMonoliticImagesComponent} from "./show-monolitic-images/show-monolitic-images.component";
-import {ShowGitImagesComponent} from "./show-git-images/show-git-images.component";
+import {ShowGitCommitsComponent} from "./show-git-images/show-git-images.component";
import {ManageRepositoryComponent} from "./manage-repository/manage-repository.component";
@Component({
@@ -146,7 +146,7 @@ export class RepositoriesComponent implements OnInit {
}
openShowGitImagesDialog(repository: Subnet) {
- const dialogRef = this.dialog.open(ShowGitImagesComponent, {
+ const dialogRef = this.dialog.open(ShowGitCommitsComponent, {
width: '85vw',
height: '85vh',
maxWidth: '85vw',
diff --git a/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.css b/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.css
index 45b503c..c2c252a 100644
--- a/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.css
+++ b/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.css
@@ -98,3 +98,96 @@ table {
gap: 1em;
padding: 1.5em;
}
+
+/* Estilos específicos para commits */
+.repository-selector-container {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ margin-bottom: 20px;
+}
+
+.branch-selector-container {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ margin-bottom: 20px;
+}
+
+.commit-id {
+ font-family: 'Courier New', monospace;
+ background-color: #f5f5f5;
+ padding: 2px 6px;
+ border-radius: 4px;
+ font-size: 0.9em;
+}
+
+.commit-message {
+ max-width: 300px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.commit-stats {
+ font-size: 0.85em;
+ color: #666;
+}
+
+.commit-tags {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 4px;
+}
+
+.commit-tags .mat-chip {
+ font-size: 0.8em;
+ height: 24px;
+}
+
+.no-tags {
+ color: #999;
+ font-style: italic;
+ font-size: 0.9em;
+}
+
+/* Mejoras en la tabla */
+.mat-mdc-table {
+ border-radius: 8px;
+ overflow: hidden;
+}
+
+.mat-mdc-header-cell {
+ background-color: #f8f9fa;
+ font-weight: 600;
+ color: #495057;
+}
+
+.mat-mdc-row:hover {
+ background-color: #f8f9fa;
+}
+
+/* Estilos para los botones de acción */
+.action-buttons {
+ display: flex;
+ gap: 4px;
+ justify-content: center;
+}
+
+.action-buttons .mat-mdc-icon-button {
+ width: 32px;
+ height: 32px;
+ line-height: 32px;
+}
+
+.filters-row {
+ display: flex;
+ gap: 20px;
+ align-items: flex-end;
+ margin-bottom: 20px;
+}
+
+.repository-selector-container,
+.branch-selector-container {
+ margin-bottom: 0 !important;
+}
diff --git a/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.html b/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.html
index e591807..2b7612a 100644
--- a/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.html
+++ b/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.html
@@ -6,96 +6,96 @@
help
- Gestionar imágenes git en {{data.repositoryName}}
+ Commits de Git en {{data.repositoryName}}