From 19ab40d585478d269a5673e6c0d3bcda58afcae3 Mon Sep 17 00:00:00 2001 From: Valt7 Date: Sun, 21 Apr 2024 12:49:12 +0200 Subject: [PATCH 1/3] wrong display of ressources after creating or deleting VM --- frontend/src/app/cancel-update.guard.ts | 1 - .../src/app/common/services/vms.service.ts | 27 ++++++++++++++++--- frontend/src/app/home/home.component.ts | 5 ++++ frontend/src/app/vms/vms.component.html | 4 +-- frontend/src/app/vms/vms.component.ts | 3 +-- 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/frontend/src/app/cancel-update.guard.ts b/frontend/src/app/cancel-update.guard.ts index 9a31937..177213a 100644 --- a/frontend/src/app/cancel-update.guard.ts +++ b/frontend/src/app/cancel-update.guard.ts @@ -13,7 +13,6 @@ export class CancelUpdateGuard implements CanActivate { const url = route.url.join('/'); if (url === 'dns' || url.startsWith('vms/') || url === 'history') { this.vmsService.cancelUpdateVms(); - console.log(route.url); } return true; } diff --git a/frontend/src/app/common/services/vms.service.ts b/frontend/src/app/common/services/vms.service.ts index 9f2b109..2e9fa41 100644 --- a/frontend/src/app/common/services/vms.service.ts +++ b/frontend/src/app/common/services/vms.service.ts @@ -228,11 +228,20 @@ export class VmsService { ).subscribe(rep => { const vmstate = rep.body['status']; if (vmstate == "deleted") { - this.vmIds$.pipe( - map(vmIds => vmIds.filter(id => id !== vmid)) - ) + //wipe out les vms pour recalculer les ressources + this.vmIds$ = new Observable(); + this.vmsSubject = new BehaviorSubject>(new Map()); + this.VMCount = 0; + this.CPUCount = 0; + this.RAMCount = 0; + this.DISKCount = 0; + this.ActiveVMCount = 0; + this.vmToRestoreCounter = 0; + this.updateVmIds(); this.updateVms(0); + + unsubscribeTimer.next(); observer.next({ deletionStatus: "deleted", errorcode: null, errorDescription: null }); observer.complete(); @@ -240,8 +249,20 @@ export class VmsService { }, error => { if (error.status == 403 || error.status == 404) { // the vm is deleted + //wipe out les vms pour recalculer les ressources + this.vmIds$ = new Observable(); + this.vmsSubject = new BehaviorSubject>(new Map()); + this.VMCount = 0; + this.CPUCount = 0; + this.RAMCount = 0; + this.DISKCount = 0; + this.ActiveVMCount = 0; + this.vmToRestoreCounter = 0; + this.updateVmIds(); this.updateVms(0); + + unsubscribeTimer.next(); observer.next({ deletionStatus: "deleted", errorcode: null, errorDescription: null }); observer.complete(); diff --git a/frontend/src/app/home/home.component.ts b/frontend/src/app/home/home.component.ts index 5c0a3c7..b03d241 100644 --- a/frontend/src/app/home/home.component.ts +++ b/frontend/src/app/home/home.component.ts @@ -286,6 +286,11 @@ export class HomeComponent implements OnInit { await delay(2000); } if (isStarted){ // There were no errors, we show the vm + + this.vmsService.CPUCount += this.nb_cpu_selected; + this.vmsService.RAMCount += this.nb_ram_selected; + this.vmsService.DISKCount += this.nb_storage_selected; + this.loading = false; this.progress = 100; this.router.navigate(['/vms/' + id]); } else { // There was an error, we show the form for a new submit diff --git a/frontend/src/app/vms/vms.component.html b/frontend/src/app/vms/vms.component.html index a45f820..824b122 100644 --- a/frontend/src/app/vms/vms.component.html +++ b/frontend/src/app/vms/vms.component.html @@ -1,5 +1,5 @@ -
+
-
+
-
+
- +
@@ -30,7 +30,7 @@
Owner: {{ vm.user }}
{{ "deletevm.loading" | translate }}
-

{{ "deletevm.noVms" | translate}}

+

{{ "deletevm.noVms" | translate}}
diff --git a/frontend/src/app/dns/dns.component.html b/frontend/src/app/dns/dns.component.html index 706f4bf..a3e8865 100644 --- a/frontend/src/app/dns/dns.component.html +++ b/frontend/src/app/dns/dns.component.html @@ -26,7 +26,7 @@

{{'dns.title.admin' | translate}
-
+
-
+

{{'dns.noEntries.user' | translate}}

{{'dns.noEntries.admin' | translate}}

@@ -163,10 +163,31 @@

{{'dns.pendingEntries.admin' | translate}} - - + +
+ +
+
+ +
+ + +
+ +
+
+ +
+              - + +
+ +
+
+ +
+ @@ -220,9 +241,12 @@

{{'dns.validatedEntries.admin' | translate}} {{dns.id}} - - + + +
+ +
diff --git a/frontend/src/app/dns/dns.component.ts b/frontend/src/app/dns/dns.component.ts index 289ba8f..ad5e27e 100644 --- a/frontend/src/app/dns/dns.component.ts +++ b/frontend/src/app/dns/dns.component.ts @@ -151,13 +151,14 @@ export class DnsComponent implements OnInit, OnDestroy { return authorized_ip.test(ip.trim()) } - accept_entry(userid: string, dnsentry: string, dnsip: string): void { + accept_entry(dns: Dns): void { if(this.user.admin) { + dns.status = "accepting" this.http.post(this.authService.SERVER_URL + '/dns/validation', { - userid: userid, - dnsentry: dnsentry, - dnsip: dnsip + userid: dns.user, + dnsentry: dns.entry, + dnsip: dns.ip }, {observe: 'response'} ) @@ -167,26 +168,31 @@ export class DnsComponent implements OnInit, OnDestroy { console.log("ok"); }, error => { - console.log("error"); + console.log(error); this.errorcode = error.status; this.httpErrorMessage = this.utils.getHttpErrorMessage(this.errorcode) + dns.status = "created" } ); } } - delete_entry(id: string): void { + delete_entry(dns: Dns, sendMail: boolean): void { if(this.user.chartevalidated || this.user.admin) { - this.http.delete(this.authService.SERVER_URL + '/dns/' + id, {observe: 'response'}) - .subscribe( - () => { - window.location.reload(); - }, - error => { - this.errorcode = error.status; - this.httpErrorMessage = this.utils.getHttpErrorMessage(this.errorcode) - }); + dns.status = "deleting"; + this.http.delete(`${this.authService.SERVER_URL}/dns/${dns.id}` + , { params: { sendMail: sendMail.toString() } } + ).subscribe( + () => { + window.location.reload(); + }, + error => { + this.errorcode = error.status; + this.httpErrorMessage = this.utils.getHttpErrorMessage(this.errorcode) + console.log(error); + dns.status = "created" + }); } } } diff --git a/frontend/src/app/models/dns.ts b/frontend/src/app/models/dns.ts index 0a91f6f..fc1db10 100644 --- a/frontend/src/app/models/dns.ts +++ b/frontend/src/app/models/dns.ts @@ -4,7 +4,7 @@ export class Dns { public entry?: string, public ip?: string, public user?: string, - public validated?: boolean - + public validated?: boolean, + public status?: string ) { } } diff --git a/frontend/src/app/vm/vm.component.html b/frontend/src/app/vm/vm.component.html index 6dbeb32..c68520b 100644 --- a/frontend/src/app/vm/vm.component.html +++ b/frontend/src/app/vm/vm.component.html @@ -37,304 +37,306 @@

{{'account.expired.title' | translate }}

-
-

VM: {{ (vm$ | async).name }}

-
-
- -
{{'vm.status' | translate}} : {{ deletionStatus != 'None' ? deletionStatus : (vm$ | async).status | translate }}
- -
{{"vm.error" | translate}} {{errorcode}} : {{utils.getHttpErrorMessage(errorcode)}}
-

- -
- -
- - -