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 952c78a..64e2e55 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
@@ -76,12 +76,17 @@ table {
}
.chip-success {
- background-color: #2ea22e !important;
+ background-color: #32c532 !important;
color: white;
}
.chip-pending {
- background-color: orange !important;
+ background-color: #bebdbd !important;
color: black;
}
+.chip-in-progress {
+ background-color: #f5a623 !important;
+ color: white;
+}
+
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 d2aa159..c4a3572 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
@@ -30,6 +30,7 @@
Fallido
Pendiente de ejecutar
+ Ejecutando
Completado con éxito
@@ -49,13 +50,15 @@
{{
trace.status === 'failed' ? 'Fallido' :
trace.status === 'success' ? 'Finalizado con éxito' :
trace.status === 'pending' ? 'Pendiente de ejecutar' :
- trace.status
+ trace.status === 'in-progress' ? 'Ejecutando' :
+ trace.status
}}
diff --git a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css
index 25efc7a..d26a2a8 100644
--- a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css
+++ b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css
@@ -74,9 +74,15 @@ mat-card-subtitle a:hover {
flex-grow: 1;
}
-button {
- margin-left: 10px;
- margin-bottom: 20px;
+.button-group {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 10px;
+ align-items: center;
+}
+
+.button-group button {
+ flex-grow: 1;
}
.item-content {
@@ -84,10 +90,6 @@ button {
width: 100%;
}
-.item-content mat-icon {
- margin-right: 10px;
-}
-
.clickable-item:hover {
cursor: pointer;
}
@@ -139,7 +141,7 @@ mat-spinner {
display: flex;
align-items: center;
gap: 10px;
- padding: 20px;
+ padding: 10px;
}
.header mat-form-field {
diff --git a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html
index 1f16945..318774f 100644
--- a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html
+++ b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html
@@ -21,6 +21,8 @@
+
@@ -38,10 +40,19 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.ts b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.ts
index fcf0bfe..a0e7bf9 100644
--- a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.ts
+++ b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.ts
@@ -428,6 +428,42 @@ export class AdvancedSearchComponent {
});
}
+ onCommandSelect(action: any): void {
+ if (action === 'partition') {
+ this.openPartitionAssistant();
+ }
+
+ if (action === 'create-image') {
+ this.openCreateImageAssistant();
+ }
+
+ if (action === 'deploy-image') {
+ this.openDeployImageAssistant();
+ }
+ }
+
+ openPartitionAssistant(): void {
+ const client = this.selectedElements[0];
+ console.log(client)
+ this.router.navigate([`${client}/partition-assistant`]).then(r => {
+ console.log('navigated', r);
+ });
+ }
+
+ openCreateImageAssistant(): void {
+ const client = this.selectedElements[0];
+ this.router.navigate([`${client}/create-image`]).then(r => {
+ console.log('navigated', r);
+ });
+ }
+
+ openDeployImageAssistant(): void {
+ const client = this.selectedElements[0];
+ this.router.navigate([`${client}/deploy-image`]).then(r => {
+ console.log('navigated', r);
+ });
+ }
+
onDobleClick(event: MouseEvent, data: any, type: string): void {
if (type === 'client') {
this.router.navigate(['client', data]);
diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.ts b/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.ts
index ccf6560..335f3cc 100644
--- a/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.ts
+++ b/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.ts
@@ -98,7 +98,6 @@ export class ClientMainViewComponent implements OnInit {
ngOnInit() {
this.clientData = history.state.clientData;
- console.log(this.clientData)
this.loadPartitions()
this.updateGeneralData();
this.updateNetworkData();
@@ -229,19 +228,19 @@ export class ClientMainViewComponent implements OnInit {
}
openPartitionAssistant(): void {
- this.router.navigate([`/client/${this.clientData.uuid}/partition-assistant`]).then(r => {
+ this.router.navigate([`/clients/${this.clientData.uuid}/partition-assistant`]).then(r => {
console.log('navigated', r);
});
}
openCreateImageAssistant(): void {
- this.router.navigate([`/client/${this.clientData.uuid}/create-image`]).then(r => {
+ this.router.navigate([`/clients/${this.clientData.uuid}/create-image`]).then(r => {
console.log('navigated', r);
});
}
openDeployImageAssistant(): void {
- this.router.navigate([`/client/${this.clientData.uuid}/deploy-image`]).then(r => {
+ this.router.navigate([`/clients/${this.clientData.uuid}/deploy-image`]).then(r => {
console.log('navigated', r);
});
}
diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.ts b/ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.ts
index 1c26c50..d306be8 100644
--- a/ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.ts
+++ b/ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.ts
@@ -149,7 +149,7 @@ export class CreateImageComponent {
name: this.name,
image: this.selectedImage,
partition: this.selectedPartition['@id'],
- input: 'assistant'
+ source: 'assistant'
};
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 836df18..58623ea 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
@@ -26,11 +26,11 @@ export class DeployImageComponent {
mcastIp: string = '';
mcastPort: string = '';
mcastMode: string = '';
- mcastSpeed: string = '';
- mcastMaxClients: string = '';
- mcastMaxTime: string = '';
+ mcastSpeed: Number = 0;
+ mcastMaxClients: Number = 0;
+ mcastMaxTime: Number = 0;
p2pMode: string = '';
- p2pTime: string = '';
+ p2pTime: Number = 0;
name: string = '';
protected p2pModeOptions = [
@@ -116,7 +116,15 @@ export class DeployImageComponent {
(response: any) => {
if (response.partitions) {
this.clientName = response.name;
- this.dataSource.data = response?.partitions;
+ this.dataSource.data = response.partitions.filter((partition: any) => {
+ return partition.partitionNumber !== 0;
+ });
+ this.p2pMode = response.organizationalUnit?.networkSettings?.p2pMode;
+ this.p2pTime = response.organizationalUnit?.networkSettings?.p2pTime;
+ this.mcastSpeed = response.organizationalUnit?.networkSettings?.mcastSpeed;
+ this.mcastMode = response.organizationalUnit?.networkSettings?.mcastMode;
+ this.mcastPort = response.organizationalUnit?.networkSettings?.mcastPort;
+ this.mcastIp = response.organizationalUnit?.networkSettings?.mcastIp;
}
},
(error) => {
@@ -140,13 +148,17 @@ export class DeployImageComponent {
save(): void {
const payload = {
client: `/clients/${this.clientId}`,
- name: this.name,
- image: this.selectedImage,
- partition: this.selectedPartition['@id']
+ method: this.selectedMethod,
+ partition: this.selectedPartition['@id'],
+ p2pMode: this.p2pMode,
+ p2pTime: this.p2pTime,
+ mcastIp: this.mcastIp,
+ mcastPort: this.mcastPort,
+ mcastMode: this.mcastMode,
+ mcastSpeed: this.mcastSpeed,
};
-
- this.http.post(`${this.baseUrl}/images`, payload)
+ this.http.post(`${this.baseUrl}${this.selectedImage}/deploy-image`, payload)
.subscribe({
next: (response) => {
this.toastService.success('Imagen creada exitosamente');
diff --git a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.ts b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.ts
index 7619310..25e81bd 100644
--- a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.ts
+++ b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.ts
@@ -142,7 +142,7 @@ export class ClientTabViewComponent {
this.syncStatus = false;
},
error => {
- this.toastService.error(error.error['hydra:description']);
+ this.toastService.error('Error de conexión con el cliente');
this.syncStatus = false;
}
);
@@ -151,7 +151,7 @@ export class ClientTabViewComponent {
handleClientClick(event: MouseEvent, client: any): void {
event.stopPropagation();
- this.router.navigate(['client', client.uuid], { state: { clientData: client } });
+ this.router.navigate(['clients', client.uuid], { state: { clientData: client } });
}
diff --git a/ogWebconsole/src/app/layout/header/header.component.html b/ogWebconsole/src/app/layout/header/header.component.html
index f42c5e8..80bdc8a 100644
--- a/ogWebconsole/src/app/layout/header/header.component.html
+++ b/ogWebconsole/src/app/layout/header/header.component.html
@@ -10,6 +10,7 @@
+
diff --git a/ogWebconsole/src/app/layout/sidebar/sidebar.component.html b/ogWebconsole/src/app/layout/sidebar/sidebar.component.html
index 109bab6..64c21aa 100644
--- a/ogWebconsole/src/app/layout/sidebar/sidebar.component.html
+++ b/ogWebconsole/src/app/layout/sidebar/sidebar.component.html
@@ -149,10 +149,10 @@
-
-
- warehouse
- Repositorios
+
+
+ warehouse
+ Repositorios
diff --git a/ogWebconsole/src/app/layout/sidebar/sidebar.component.ts b/ogWebconsole/src/app/layout/sidebar/sidebar.component.ts
index b051273..8de24e6 100644
--- a/ogWebconsole/src/app/layout/sidebar/sidebar.component.ts
+++ b/ogWebconsole/src/app/layout/sidebar/sidebar.component.ts
@@ -29,7 +29,6 @@ export class SidebarComponent {
this.showSoftwareSub = !this.showSoftwareSub;
}
-
constructor(public dialog: MatDialog) {}
ngOnInit(): void {