-
- {{ partition.type }} ({{ partition.size }} GB)
+
+
+
+
+
+
+
+ {{ partition.type }} ({{ (partition.size / 1024).toFixed(2) }} GB)
+
+
+
+
+
+
+
{{ errorMessage }}
-
-
-
+
+
+
diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.ts b/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.ts
index 4e066b9..472f7e6 100644
--- a/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.ts
+++ b/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.ts
@@ -1,6 +1,7 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import {Component, EventEmitter, Inject, Input, OnInit, Output} from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { ToastrService } from 'ngx-toastr';
+import {MAT_DIALOG_DATA} from "@angular/material/dialog";
interface Partition {
uuid?: string;
@@ -8,6 +9,7 @@ interface Partition {
size: number;
type: string;
sizeBytes: number;
+ memoryUsage: number;
format: boolean;
color: string;
percentage: number;
@@ -20,8 +22,6 @@ interface Partition {
})
export class PartitionAssistantComponent implements OnInit {
baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
- @Input() data: any;
- @Input() clientUuid: string | undefined;
@Output() dataChange = new EventEmitter
();
errorMessage = '';
@@ -30,14 +30,18 @@ export class PartitionAssistantComponent implements OnInit {
private apiUrl: string = this.baseUrl + '/partitions';
- constructor(private http: HttpClient, private toastService: ToastrService) {}
+ constructor(
+ private http: HttpClient,
+ private toastService: ToastrService,
+ @Inject(MAT_DIALOG_DATA) public data: any
+ ) {}
ngOnInit() {
- this.loadClientData();
+ this.loadPartitions();
}
- loadClientData() {
- const url = `${this.baseUrl}/clients/${this.clientUuid}`;
+ loadPartitions() {
+ const url = `${this.baseUrl}${this.data}`;
this.http.get(url).subscribe(
(response) => {
this.data = response;
@@ -68,6 +72,7 @@ export class PartitionAssistantComponent implements OnInit {
uuid: partition.uuid,
partitionNumber: partition.partitionNumber,
size: this.convertBytesToGB(partition.size),
+ memoryUsage: partition.memoryUsage,
type: partition.type || partition.filesystem || 'NTFS',
sizeBytes: partition.size,
format: false,
@@ -88,12 +93,12 @@ export class PartitionAssistantComponent implements OnInit {
}
convertBytesToGB(bytes: number): number {
- return bytes / 1024;
+ return bytes
}
updatePartitionPercentages(partitions: Partition[], totalDiskSize: number) {
partitions.forEach((partition) => {
- partition.percentage = (partition.size / totalDiskSize) * 100;
+ partition.percentage = (partition.size / totalDiskSize) * 100
});
}
@@ -102,6 +107,7 @@ export class PartitionAssistantComponent implements OnInit {
if (disk) {
const remainingGB = this.getRemainingGB(disk.partitions, disk.totalDiskSize);
+ console.log(remainingGB)
if (remainingGB > 0) {
const maxPartitionNumber =
disk.partitions.length > 0 ? Math.max(...disk.partitions.map((p) => p.partitionNumber)) : 0;
@@ -111,6 +117,7 @@ export class PartitionAssistantComponent implements OnInit {
partitionNumber: newPartitionNumber,
size: 0,
type: 'NTFS',
+ memoryUsage: 0,
sizeBytes: 0,
format: false,
color: '#' + Math.floor(Math.random() * 16777215).toString(16),
@@ -136,13 +143,14 @@ export class PartitionAssistantComponent implements OnInit {
} else {
this.errorMessage = '';
partition.size = size;
- partition.sizeBytes = size * 1024;
+ partition.sizeBytes = size;
this.updatePartitionPercentages(disk.partitions, disk.totalDiskSize);
}
}
}
getRemainingGB(partitions: Partition[], totalDiskSize: number): number {
+ console.log(totalDiskSize)
const totalUsedGB = partitions.reduce((acc, partition) => acc + partition.size, 0);
return Math.max(0, totalDiskSize - totalUsedGB);
}
@@ -182,6 +190,18 @@ export class PartitionAssistantComponent implements OnInit {
}
save() {
+ const invalidDisks = this.disks.filter(disk => {
+ const totalPartitionSize = disk.partitions.reduce((sum, partition) => sum + partition.size, 0);
+ return totalPartitionSize > disk.totalDiskSize;
+ });
+
+ if (invalidDisks.length > 0) {
+ this.errorMessage = 'El tamaño total de las particiones en uno o más discos excede el tamaño total del disco.';
+ return;
+ } else {
+ this.errorMessage = '';
+ }
+
const modifiedPartitions = this.getModifiedOrNewPartitions();
if (modifiedPartitions.length === 0) {
@@ -193,32 +213,40 @@ export class PartitionAssistantComponent implements OnInit {
const payload = {
diskNumber: diskNumber,
partitionNumber: partitionNumber,
+ memoryUsage: partition.memoryUsage,
size: partition.size,
filesystem: partition.type,
- client: `/clients/${this.clientUuid}`
+ client: this.data['@id']
};
if (isNew) {
this.http.post(this.apiUrl, payload).subscribe(
(response) => {
this.toastService.success('Partición creada exitosamente');
- this.loadClientData();
+ this.loadPartitions();
},
- (error) => {}
+ (error) => {
+ console.error('Error al crear la partición:', error);
+ this.toastService.error('Error al crear la partición');
+ }
);
} else if (partition.uuid) {
const patchUrl = `${this.apiUrl}/${partition.uuid}`;
this.http.patch(patchUrl, payload).subscribe(
(response) => {
this.toastService.success('Partición actualizada exitosamente');
- this.loadClientData();
+ this.loadPartitions();
},
- (error) => {}
+ (error) => {
+ console.error('Error al actualizar la partición:', error);
+ this.toastService.error('Error al actualizar la partición');
+ }
);
}
});
}
+
removePartition(diskNumber: number, partition: Partition) {
const disk = this.disks.find((d) => d.diskNumber === diskNumber);
@@ -233,7 +261,7 @@ export class PartitionAssistantComponent implements OnInit {
this.http.delete(deleteUrl).subscribe(
(response) => {
this.toastService.success('Partición eliminada exitosamente');
- this.loadClientData();
+ this.loadPartitions();
},
(error) => {}
);
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 0c34fad..7619310 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
@@ -151,8 +151,6 @@ export class ClientTabViewComponent {
handleClientClick(event: MouseEvent, client: any): void {
event.stopPropagation();
- /* const dialogRef = this.dialog.open(ClientViewComponent, { data: { client }, width: '800px', height:'700px' }); */
-
this.router.navigate(['client', client.uuid], { state: { clientData: client } });
}