From 04bfce32d5fce7c68beacc6bf20e86c9e5ede875 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 22:37:25 +0000 Subject: [PATCH 1/5] Bump crypto-js from 4.1.1 to 4.2.0 Bumps [crypto-js](https://github.com/brix/crypto-js) from 4.1.1 to 4.2.0. - [Commits](https://github.com/brix/crypto-js/compare/4.1.1...4.2.0) --- updated-dependencies: - dependency-name: crypto-js dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1f73ae9aca..d7414e6c37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ "eslint-config-airbnb-base": "15.0.0", "eslint-plugin-import": "2.28.1", "eslint-plugin-jsdoc": "46.8.2", - "eslint-plugin-no-null": "latest", + "eslint-plugin-no-null": "*", "eslint-plugin-prefer-arrow": "1.2.3", "exports-loader": "4.0.0", "file-loader": "6.2.0", @@ -7599,9 +7599,10 @@ } }, "node_modules/crypto-js": { - "version": "4.1.1", - "dev": true, - "license": "MIT" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==", + "dev": true }, "node_modules/css-declaration-sorter": { "version": "6.3.1", @@ -25628,7 +25629,9 @@ } }, "crypto-js": { - "version": "4.1.1", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==", "dev": true }, "css-declaration-sorter": { From 284f634c78e768f978cfe3817c9ef015d81deca7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 05:35:30 +0000 Subject: [PATCH 2/5] build(deps-dev): bump @adobe/css-tools from 4.3.1 to 4.3.2 Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2. - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md) - [Commits](https://github.com/adobe/css-tools/commits) --- updated-dependencies: - dependency-name: "@adobe/css-tools" dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 97 +++++++++-------------------------------------- 1 file changed, 17 insertions(+), 80 deletions(-) diff --git a/package-lock.json b/package-lock.json index 12e6cc72f1..d5905b6f23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "@denbi/cloud-portal-webapp", "version": "4.804.0", "dependencies": { + "@angular-eslint/eslint-plugin": "^16.0.3", "@angular/animations": "16.2.12", "@angular/cdk": "16.2.12", "@angular/common": "16.2.12", @@ -69,7 +70,7 @@ "devDependencies": { "@angular-devkit/build-angular": "^16.1.4", "@angular-eslint/builder": "16.2.0", - "@angular-eslint/eslint-plugin": "^16.3.1", + "@angular-eslint/eslint-plugin": "16.2.0", "@angular-eslint/eslint-plugin-template": "16.2.0", "@angular-eslint/schematics": "16.2.0", "@angular-eslint/template-parser": "16.2.0", @@ -88,7 +89,7 @@ "eslint-config-airbnb-base": "15.0.0", "eslint-plugin-import": "^2.29.0", "eslint-plugin-jsdoc": "46.8.2", - "eslint-plugin-no-null": "latest", + "eslint-plugin-no-null": "*", "eslint-plugin-prefer-arrow": "1.2.3", "exports-loader": "4.0.0", "file-loader": "6.2.0", @@ -124,9 +125,9 @@ } }, "node_modules/@adobe/css-tools": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz", - "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz", + "integrity": "sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==", "dev": true, "peer": true }, @@ -588,12 +589,12 @@ "dev": true }, "node_modules/@angular-eslint/eslint-plugin": { - "version": "16.3.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-16.3.1.tgz", - "integrity": "sha512-kSc8ESfoy8TUSthbq0Lpq9e17I+3Smy4rHoNpKCFEGuJgPs0+OssZMxB6a5EawGbv2EKTPEtrxzFm1WsLR0U9Q==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-16.2.0.tgz", + "integrity": "sha512-zdiAIox1T+B71HL+A8m+1jWdU34nvPGLhCRw/uZNwHzknsF4tYzNQ9W7T/SC/g/2s1yT2yNosEVNJSGSFvunJg==", "dev": true, "dependencies": { - "@angular-eslint/utils": "16.3.1", + "@angular-eslint/utils": "16.2.0", "@typescript-eslint/utils": "5.62.0" }, "peerDependencies": { @@ -619,26 +620,6 @@ "typescript": "*" } }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@angular-eslint/bundled-angular-compiler": { - "version": "16.3.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-16.3.1.tgz", - "integrity": "sha512-m4WP1xwS9XLcC/3n6lIcG5HZoai/5eb5W3xm48GVcv//0qE2p7S96RSgKPgGHvif5pF8O9xAqEWs3gDEG45+7A==", - "dev": true - }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@angular-eslint/utils": { - "version": "16.3.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-16.3.1.tgz", - "integrity": "sha512-tEBcce0rG+DmcPO8jhRffUFDioGw3G4cUAE15XlRctY1J3QzOBH9HdUOTDt0mMjBgpWCzh0YVT1Moh2bPXU9Xg==", - "dev": true, - "dependencies": { - "@angular-eslint/bundled-angular-compiler": "16.3.1", - "@typescript-eslint/utils": "5.62.0" - }, - "peerDependencies": { - "eslint": "^7.20.0 || ^8.0.0", - "typescript": "*" - } - }, "node_modules/@angular-eslint/schematics": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-16.2.0.tgz", @@ -657,20 +638,6 @@ "@angular/cli": ">= 16.0.0 < 17.0.0" } }, - "node_modules/@angular-eslint/schematics/node_modules/@angular-eslint/eslint-plugin": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-16.2.0.tgz", - "integrity": "sha512-zdiAIox1T+B71HL+A8m+1jWdU34nvPGLhCRw/uZNwHzknsF4tYzNQ9W7T/SC/g/2s1yT2yNosEVNJSGSFvunJg==", - "dev": true, - "dependencies": { - "@angular-eslint/utils": "16.2.0", - "@typescript-eslint/utils": "5.62.0" - }, - "peerDependencies": { - "eslint": "^7.20.0 || ^8.0.0", - "typescript": "*" - } - }, "node_modules/@angular-eslint/template-parser": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-16.2.0.tgz", @@ -20998,9 +20965,9 @@ "dev": true }, "@adobe/css-tools": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz", - "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz", + "integrity": "sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==", "dev": true, "peer": true }, @@ -21304,31 +21271,13 @@ "dev": true }, "@angular-eslint/eslint-plugin": { - "version": "16.3.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-16.3.1.tgz", - "integrity": "sha512-kSc8ESfoy8TUSthbq0Lpq9e17I+3Smy4rHoNpKCFEGuJgPs0+OssZMxB6a5EawGbv2EKTPEtrxzFm1WsLR0U9Q==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-16.2.0.tgz", + "integrity": "sha512-zdiAIox1T+B71HL+A8m+1jWdU34nvPGLhCRw/uZNwHzknsF4tYzNQ9W7T/SC/g/2s1yT2yNosEVNJSGSFvunJg==", "dev": true, "requires": { - "@angular-eslint/utils": "16.3.1", + "@angular-eslint/utils": "16.2.0", "@typescript-eslint/utils": "5.62.0" - }, - "dependencies": { - "@angular-eslint/bundled-angular-compiler": { - "version": "16.3.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-16.3.1.tgz", - "integrity": "sha512-m4WP1xwS9XLcC/3n6lIcG5HZoai/5eb5W3xm48GVcv//0qE2p7S96RSgKPgGHvif5pF8O9xAqEWs3gDEG45+7A==", - "dev": true - }, - "@angular-eslint/utils": { - "version": "16.3.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-16.3.1.tgz", - "integrity": "sha512-tEBcce0rG+DmcPO8jhRffUFDioGw3G4cUAE15XlRctY1J3QzOBH9HdUOTDt0mMjBgpWCzh0YVT1Moh2bPXU9Xg==", - "dev": true, - "requires": { - "@angular-eslint/bundled-angular-compiler": "16.3.1", - "@typescript-eslint/utils": "5.62.0" - } - } } }, "@angular-eslint/eslint-plugin-template": { @@ -21358,18 +21307,6 @@ "nx": "16.5.1", "strip-json-comments": "3.1.1", "tmp": "0.2.1" - }, - "dependencies": { - "@angular-eslint/eslint-plugin": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-16.2.0.tgz", - "integrity": "sha512-zdiAIox1T+B71HL+A8m+1jWdU34nvPGLhCRw/uZNwHzknsF4tYzNQ9W7T/SC/g/2s1yT2yNosEVNJSGSFvunJg==", - "dev": true, - "requires": { - "@angular-eslint/utils": "16.2.0", - "@typescript-eslint/utils": "5.62.0" - } - } } }, "@angular-eslint/template-parser": { From 6c2e63086bed10f64fe4343eaaf507d7e80c3047 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Mar 2024 23:17:03 +0000 Subject: [PATCH 3/5] build(deps): bump follow-redirects from 1.15.4 to 1.15.6 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7a336625b8..863c8a8561 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "d3": "7.8.5", "export-to-csv": "1.2.1", "file-saver": "2.0.5", - "follow-redirects": "1.15.4", + "follow-redirects": "1.15.6", "html2canvas": "1.4.1", "is-promise": "4.0.0", "jsnlog": "2.30.0", @@ -11339,9 +11339,9 @@ "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", @@ -28843,9 +28843,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==" + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==" }, "font-family-papandreou": { "version": "0.2.0-patch2" diff --git a/package.json b/package.json index fd17418d6d..c0e7e6b601 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "d3": "7.8.5", "export-to-csv": "1.2.1", "file-saver": "2.0.5", - "follow-redirects": "1.15.4", + "follow-redirects": "1.15.6", "html2canvas": "1.4.1", "is-promise": "4.0.0", "jsnlog": "2.30.0", From 94ebf511907f9455edd04786fdac0ac0e5cf017e Mon Sep 17 00:00:00 2001 From: vktrrdk Date: Wed, 3 Apr 2024 17:16:40 +0000 Subject: [PATCH 4/5] package-lock --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index b2f2dc4e02..4fff1ccef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20606,9 +20606,9 @@ } }, "node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz", - "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==", + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", + "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", "dev": true, "dependencies": { "colorette": "^2.0.10", @@ -35039,9 +35039,9 @@ }, "dependencies": { "webpack-dev-middleware": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz", - "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==", + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", + "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", "dev": true, "requires": { "colorette": "^2.0.10", From 46ea9fb59bf6228ef0ee7c13f7d60c42baa61e18 Mon Sep 17 00:00:00 2001 From: dweinholz Date: Mon, 15 Apr 2024 11:43:46 +0200 Subject: [PATCH 5/5] feat(Application):added option to withdraw modification/extension requests --- src/app/api-connector/applications.service.ts | 20 ++++++ .../application.model/application.model.ts | 2 + .../withdraw/withdraw-modal.component.html | 64 +++++++++++++++++++ .../withdraw/withdraw-modal.component.ts | 46 +++++++++++++ .../projectmanagement/overview.component.html | 33 ++++++++-- .../projectmanagement/overview.component.ts | 28 +++++++- 6 files changed, 188 insertions(+), 5 deletions(-) create mode 100644 src/app/projectmanagement/modals/withdraw/withdraw-modal.component.html create mode 100644 src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts diff --git a/src/app/api-connector/applications.service.ts b/src/app/api-connector/applications.service.ts index 7290bcb7aa..bd283a951f 100644 --- a/src/app/api-connector/applications.service.ts +++ b/src/app/api-connector/applications.service.ts @@ -239,6 +239,26 @@ export class ApplicationsService { ); } + withdrawExtensionRequest(request_id: number | string): Observable { + return this.http.post( + `${ApiSettings.getApiBaseURL()}project_applications/lifetime/extensions/${request_id}/withdraw/`, + null, + { + withCredentials: true, + }, + ); + } + + withdrawModificationRequest(request_id: number | string): Observable { + return this.http.post( + `${ApiSettings.getApiBaseURL()}project_applications/modifications/${request_id}/withdraw/`, + null, + { + withCredentials: true, + }, + ); + } + declineAdditionalLifetime(request_id: number | string): Observable { return this.http.post( `${ApiSettings.getApiBaseURL()}project_applications/lifetime/extensions/${request_id}/decline/`, diff --git a/src/app/applications/application.model/application.model.ts b/src/app/applications/application.model/application.model.ts index 85e373535e..c07ce90a99 100644 --- a/src/app/applications/application.model/application.model.ts +++ b/src/app/applications/application.model/application.model.ts @@ -37,6 +37,8 @@ export class Application { project_application_compute_center: ComputecenterComponent; project_application_openstack_project: boolean; project_application_total_gpu: number = 0; + lifetime_extension_request_id: number | string; + modification_extension_request_id: number | string; pi_approval_notification_send: boolean; pi_approval_notification_expired: boolean; diff --git a/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.html b/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.html new file mode 100644 index 0000000000..591662de93 --- /dev/null +++ b/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.html @@ -0,0 +1,64 @@ +
+
+

+ Withdraw + @if (type === WITHDRAWAL_TYPES.MODIFICATION) { + Modification + } @else if (type === WITHDRAWAL_TYPES.EXTENSION) { + Extension + } + Request +

+ +
+
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+ +
diff --git a/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts b/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts new file mode 100644 index 0000000000..ff6ca1edcf --- /dev/null +++ b/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts @@ -0,0 +1,46 @@ +import { Component, EventEmitter } from '@angular/core'; +import { BsModalRef } from 'ngx-bootstrap/modal'; + +import { ApplicationsService } from '../../../api-connector/applications.service'; + +export enum WITHDRAWAL_TYPES { + MODIFICATION, + EXTENSION, +} + +@Component({ + selector: 'app-withdrawl-modal', + templateUrl: './withdraw-modal.component.html', + providers: [ApplicationsService], +}) +export class WithdrawModalComponent { + target_id: string | number; + type: WITHDRAWAL_TYPES; + event: EventEmitter = new EventEmitter(); + + constructor( + public bsModalRef: BsModalRef, + private projectService: ApplicationsService, + ) { + // eslint-disable-next-line no-empty-function + } + + withdrawTarget() { + switch (this.type) { + case WITHDRAWAL_TYPES.EXTENSION: + this.projectService.withdrawExtensionRequest(this.target_id).subscribe(() => { + this.bsModalRef.hide(); + this.event.emit(true); + }); + break; + case WITHDRAWAL_TYPES.MODIFICATION: + this.projectService.withdrawModificationRequest(this.target_id).subscribe(() => { + this.bsModalRef.hide(); + this.event.emit(true); + }); + break; + } + } + + protected readonly WITHDRAWAL_TYPES = WITHDRAWAL_TYPES; +} diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html index d9a79dd45c..65b4fe595d 100644 --- a/src/app/projectmanagement/overview.component.html +++ b/src/app/projectmanagement/overview.component.html @@ -308,6 +308,18 @@

+ +