From 9596331c34edd58ab0065921d0060f9836b09318 Mon Sep 17 00:00:00 2001 From: mahdibenromdhane Date: Thu, 30 Mar 2023 19:11:01 +0200 Subject: [PATCH 1/6] use forceSynchronizeUserForBilling new endpoint --- src/app/services/central-server.service.ts | 16 ++++++++-------- src/app/types/Server.ts | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/app/services/central-server.service.ts b/src/app/services/central-server.service.ts index d294470f03..75b90f4c48 100644 --- a/src/app/services/central-server.service.ts +++ b/src/app/services/central-server.service.ts @@ -1699,16 +1699,16 @@ export class CentralServerService { public forceSynchronizeUserForBilling(userID: string): Observable { this.checkInit(); // Execute the REST service - return this.httpClient.post(`${this.centralRestServerServiceSecuredURL}/${ServerAction.BILLING_FORCE_SYNCHRONIZE_USER}`, - { id: userID }, - { - headers: this.buildHttpHeaders(), - }) - .pipe( - catchError(this.handleHttpError), - ); + return this.httpClient.post(this.buildRestEndpointUrl(RESTServerRoute.REST_FORCE_SYNCHRONIZE_USER), { + id: userID + }, { + headers: this.buildHttpHeaders(), + }).pipe( + catchError(this.handleHttpError), + ); } + public getBillingTaxes(): Observable { this.checkInit(); // Execute the REST service diff --git a/src/app/types/Server.ts b/src/app/types/Server.ts index 5f4898b104..af2cd4e051 100644 --- a/src/app/types/Server.ts +++ b/src/app/types/Server.ts @@ -692,6 +692,7 @@ export enum RESTServerRoute { REST_BILLING_SETTING = 'billing-setting', // GET and PUT REST_BILLING_CHECK = 'billing/check', + REST_FORCE_SYNCHRONIZE_USER = 'billing/force-synchronize-user', REST_BILLING_CLEAR_TEST_DATA = 'billing/clearTestData', REST_BILLING_TAXES = 'billing/taxes', From 04ef969df2123d294b0d93f29f532fbdf671dec5 Mon Sep 17 00:00:00 2001 From: mahdibenromdhane Date: Fri, 31 Mar 2023 18:30:20 +0200 Subject: [PATCH 2/6] use patch insead of post --- src/app/services/central-server.service.ts | 7 ++----- src/app/types/Server.ts | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/app/services/central-server.service.ts b/src/app/services/central-server.service.ts index 75b90f4c48..1f31715cad 100644 --- a/src/app/services/central-server.service.ts +++ b/src/app/services/central-server.service.ts @@ -1697,11 +1697,8 @@ export class CentralServerService { } public forceSynchronizeUserForBilling(userID: string): Observable { - this.checkInit(); - // Execute the REST service - return this.httpClient.post(this.buildRestEndpointUrl(RESTServerRoute.REST_FORCE_SYNCHRONIZE_USER), { - id: userID - }, { + const url = this.buildRestEndpointUrl(RESTServerRoute.REST_BILLING_USER_SYNCHRONIZE, { id: userID }); + return this.httpClient.patch(url, {}, { headers: this.buildHttpHeaders(), }).pipe( catchError(this.handleHttpError), diff --git a/src/app/types/Server.ts b/src/app/types/Server.ts index af2cd4e051..8aedf68a11 100644 --- a/src/app/types/Server.ts +++ b/src/app/types/Server.ts @@ -692,7 +692,7 @@ export enum RESTServerRoute { REST_BILLING_SETTING = 'billing-setting', // GET and PUT REST_BILLING_CHECK = 'billing/check', - REST_FORCE_SYNCHRONIZE_USER = 'billing/force-synchronize-user', + REST_BILLING_USER_SYNCHRONIZE = 'billing/users/:id/synchronize', REST_BILLING_CLEAR_TEST_DATA = 'billing/clearTestData', REST_BILLING_TAXES = 'billing/taxes', From 8ff6a00b6e9c4627eea2b56591a3a0c2e3f6338b Mon Sep 17 00:00:00 2001 From: ClaudeROSSI Date: Tue, 4 Apr 2023 17:48:28 +0200 Subject: [PATCH 3/6] version 2.7.7 --- package-lock.json | 4 ++-- package.json | 2 +- src/app/release-notes/release-notes.component.ts | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 24eb689787..9aba2f59d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ev-dashboard", - "version": "2.7.6", + "version": "2.7.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ev-dashboard", - "version": "2.7.6", + "version": "2.7.7", "license": "Apache-2.0", "dependencies": { "@angular/animations": "^14.1.1", diff --git a/package.json b/package.json index dcc89519e2..9b60e06dff 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ev-dashboard", "description": "Dashboard for monitoring the EV Charging Infrastructure", "homepage": "https://github.com/sap-labs-france/ev-dashboard", - "version": "2.7.6", + "version": "2.7.7", "engines": { "node": "^16.15.x", "npm": "^8.11.x" diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts index 4d8259d51c..b70925169c 100644 --- a/src/app/release-notes/release-notes.component.ts +++ b/src/app/release-notes/release-notes.component.ts @@ -23,6 +23,19 @@ export class ReleaseNotesComponent { } public buildReleaseNotes() { this.releaseNotes = [ + { + version: '2.7.7', + date: new Date('2023-04-04'), + componentChanges: [ + { + name: 'Dashboard', + changes: [ + 'Rate Limiter - new settings to prevent DDOS', + 'Monitoring - new metrics on notifications' + ], + }, + ], + }, { version: '2.7.6', date: new Date('2023-03-28'), From 43632c47133442c97fe3a160ea3e7fc46e8580da Mon Sep 17 00:00:00 2001 From: ClaudeROSSI Date: Thu, 6 Apr 2023 11:30:49 +0200 Subject: [PATCH 4/6] Version 2.7.7 - update release notes --- src/app/release-notes/release-notes.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts index b70925169c..32166e8a24 100644 --- a/src/app/release-notes/release-notes.component.ts +++ b/src/app/release-notes/release-notes.component.ts @@ -31,7 +31,8 @@ export class ReleaseNotesComponent { name: 'Dashboard', changes: [ 'Rate Limiter - new settings to prevent DDOS', - 'Monitoring - new metrics on notifications' + 'Monitoring - new metrics on notifications', + 'Smart Charging - fix - targetStateOfCharge can be null' ], }, ], From 830b4b3590e51c7f007f16a21423780fc7244ec9 Mon Sep 17 00:00:00 2001 From: ClaudeROSSI Date: Thu, 6 Apr 2023 11:54:44 +0200 Subject: [PATCH 5/6] missing server constants - TENANT_UPDATE_DATA --- src/app/types/Server.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/types/Server.ts b/src/app/types/Server.ts index 8aedf68a11..84798af696 100644 --- a/src/app/types/Server.ts +++ b/src/app/types/Server.ts @@ -359,6 +359,7 @@ export enum ServerAction { TENANTS = 'Tenants', TENANT = 'Tenant', TENANT_UPDATE = 'TenantUpdate', + TENANT_UPDATE_DATA = 'TenantUpdateData', TENANT_DELETE = 'TenantDelete', TENANT_LOGO = 'TenantLogo', From 3dcf19222b0511d34366d2444e82ab2e8c4f21c7 Mon Sep 17 00:00:00 2001 From: Luc MARGARON Date: Thu, 6 Apr 2023 13:56:01 +0200 Subject: [PATCH 6/6] added ServerAction constant RateLimiter and shield --- src/app/types/Server.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/types/Server.ts b/src/app/types/Server.ts index 8aedf68a11..30b2f404cc 100644 --- a/src/app/types/Server.ts +++ b/src/app/types/Server.ts @@ -2,6 +2,9 @@ export enum ServerAction { UNKNOWN_ACTION = 'Unknown', + RATE_LIMITER = 'RateLimiter', + SHIELD ='Shield', + SAP_CONCUR_REQUEST = 'SapConcurRequest', RECAPTCHA_REQUEST = 'RecaptchaRequest', GREENCOM_REQUEST = 'GreencomRequest',