Merge branch 'staging'

Dockerfile

@@ -20,7 +20,7 @@ COPY . .
 RUN $(npm bin)/ng build --configuration=custom   --build-optimizer
 
 ### STAGE 2: Setup ###
-FROM nginx:1.23.3-alpine
+FROM nginx:1.23.4-alpine
 
 ## Copy our default nginx config
 COPY nginx/default.conf /etc/nginx/conf.d/

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@denbi/cloud-portal-webapp",
-  "version": "4.661.0",
+  "version": "4.668.0",
   "description": "de.NBI Cloud Portal",
   "scripts": {
     "ng": "ng serve",
@@ -19,22 +19,22 @@
   "private": true,
   "dependencies": {
     "@angular-eslint/eslint-plugin": "^15.2.0",
-    "@angular/animations": "15.2.4",
-    "@angular/cdk": "15.2.4",
-    "@angular/common": "15.2.4",
-    "@angular/compiler": "15.2.4",
-    "@angular/core": "15.2.4",
-    "@angular/forms": "15.2.4",
-    "@angular/localize": "15.2.4",
-    "@angular/platform-browser": "15.2.4",
-    "@angular/platform-browser-dynamic": "15.2.4",
-    "@angular/router": "15.2.4",
-    "@angular/service-worker": "15.2.4",
-    "@angular/upgrade": "15.2.4",
+    "@angular/animations": "15.2.5",
+    "@angular/cdk": "15.2.5",
+    "@angular/common": "15.2.5",
+    "@angular/compiler": "15.2.5",
+    "@angular/core": "15.2.5",
+    "@angular/forms": "15.2.5",
+    "@angular/localize": "15.2.5",
+    "@angular/platform-browser": "15.2.5",
+    "@angular/platform-browser-dynamic": "15.2.5",
+    "@angular/router": "15.2.5",
+    "@angular/service-worker": "15.2.5",
+    "@angular/upgrade": "15.2.5",
     "@coreui/angular": "^4.3.4",
     "@coreui/coreui": "4.2.6",
     "@coreui/icons-angular": "^4.3.0",
-    "@ng-bootstrap/ng-bootstrap": "14.0.1",
+    "@ng-bootstrap/ng-bootstrap": "14.1.0",
     "@ng-select/ng-select": "10.0.4",
     "@sindresorhus/transliterate": "1.6.0",
     "@types/d3": "7.4.0",
@@ -49,7 +49,7 @@
     "core-js": "3.29.1",
     "css-loader": "6.7.3",
     "cssnano": "6.0.0",
-    "d3": "7.8.3",
+    "d3": "7.8.4",
     "eslint": "^8.28.0",
     "export-to-csv": "0.2.1",
     "express": "4.18.2",
@@ -93,11 +93,11 @@
     "@angular-eslint/schematics": "15.2.1",
     "@angular-eslint/template-parser": "15.2.1",
     "@angular/cli": "15.2.4",
-    "@angular/compiler-cli": "15.2.4",
+    "@angular/compiler-cli": "15.2.5",
     "@compodoc/compodoc": "1.1.19",
-    "@playwright/test": "1.32.1",
+    "@playwright/test": "1.32.2",
     "@types/jasmine": "4.3.1",
-    "@types/node": "18.15.10",
+    "@types/node": "18.15.11",
     "@typescript-eslint/eslint-plugin": "^5.43.0",
     "@typescript-eslint/parser": "^5.43.0",
     "async": "3.2.4",
@@ -106,7 +106,7 @@
     "eslint": "^8.28.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-jsdoc": "40.1.0",
+    "eslint-plugin-jsdoc": "40.1.1",
     "eslint-plugin-no-null": "latest",
     "eslint-plugin-prefer-arrow": "1.2.3",
     "exports-loader": "4.0.0",

src/app/applications/application-formular/application-formular.component.html

@@ -1597,7 +1597,7 @@ <h6><strong>Platforms</strong></h6>
 								id="approveApplicationButtonPI"
 								class="btn btn-sm btn-success"
 							>
-								<i class="fa fa-dot-circle-o"></i>
+								<i class="far fa-dot-circle"></i>
 								Approve Application
 							</button>
 						</label>
@@ -1623,7 +1623,7 @@ <h6><strong>Platforms</strong></h6>
 							class="btn btn-sm btn-success"
 							type="button"
 						>
-							<i class="fa fa-dot-circle-o"></i> Submit Application
+							<i class="far fa-dot-circle"></i> Submit Application
 						</button>
 					</div>
 				</div>

src/app/applications/applications.component.html

@@ -211,8 +211,8 @@
 															[id]="computeCenter.Name"
 														>
 															{{ computeCenter.Name }}
-														</option></ng-container
-													>
+														</option>
+													</ng-container>
 												</select>
 												<span *ngIf="application | hasstatusinlist : Application_States.WAIT_FOR_CONFIRMATION">{{
 													application?.project_application_compute_center?.Name
@@ -397,7 +397,7 @@
 									<th></th>
 									<th>Project Name</th>
 									<th>Short Name</th>
-									<th>Date submitted</th>
+									<th>Modification submitted</th>
 									<th>User</th>
 									<th>Institute</th>
 									<th>Compute Center</th>
@@ -461,7 +461,7 @@
 											</td>
 											<td>{{ application?.project_application_name }}</td>
 											<td>{{ application?.project_application_shortname }}</td>
-											<td>{{ application?.project_application_date_submitted }}</td>
+											<td>{{ application?.project_modification_request?.date_submitted }}</td>
 											<td style="word-wrap: break-word; min-width: 110px; max-width: 130px; white-space: normal">
 												{{ application?.project_application_user?.username }}
 											</td>
@@ -592,7 +592,7 @@
 									<th></th>
 									<th>Project Name</th>
 									<th>Short Name</th>
-									<th>Date submitted</th>
+									<th>Lifetime extension submitted</th>
 									<th>User</th>
 									<th>Institute</th>
 									<th>Compute Center</th>
@@ -656,7 +656,7 @@
 											</td>
 											<td>{{ application?.project_application_name }}</td>
 											<td>{{ application?.project_application_shortname }}</td>
-											<td>{{ application?.project_application_date_submitted }}</td>
+											<td>{{ application?.project_lifetime_request?.date_submitted }}</td>
 											<td style="word-wrap: break-word; min-width: 110px; max-width: 130px; white-space: normal">
 												{{ application?.project_application_user?.username }}
 											</td>
@@ -762,7 +762,7 @@
 									<th></th>
 									<th>Project Name</th>
 									<th>Short Name</th>
-									<th>Date submitted</th>
+									<th>Credits request submitted</th>
 									<th>User</th>
 									<th>Institute</th>
 									<th>Compute Center</th>
@@ -826,7 +826,7 @@
 											</td>
 											<td>{{ application?.project_application_name }}</td>
 											<td>{{ application?.project_application_shortname }}</td>
-											<td>{{ application?.project_application_date_submitted }}</td>
+											<td>{{ application?.project_credit_request?.date_submitted }}</td>
 											<td style="word-wrap: break-word; min-width: 110px; max-width: 130px; white-space: normal">
 												{{ application?.project_application_user?.username }}
 											</td>
@@ -992,10 +992,10 @@
 											Information
 										</button>
 										<!--button (click)="deleteModal.show();setDeleteId(application?.application_status_id)"
-                                                type="button"
-                                                class="btn btn-secondary">
-                                        Remove Application
-                                </button-->
+                                            type="button"
+                                            class="btn btn-secondary">
+                                    Remove Application
+                            </button-->
 									</td>
 								</tr>
 								<td colspan="12">
@@ -1390,7 +1390,7 @@ <h6 class="col-md-8 form-control-label">
 						(click)="adjustModal.hide(); adjustApplication()"
 						[disabled]="resourceAdjustmentForm.invalid || !atLeastOneVM"
 					>
-						<i class="fa fa-dot-circle-o"></i>
+						<i class="far fa-dot-circle"></i>
 						Adjust
 					</button>
 					<button type="button" class="btn btn-danger" (click)="adjustModal.hide()">Discard</button>

src/app/applications/applications.component.ts

@@ -433,6 +433,41 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
 	/**
 	 * Loading Applications dependent from the current tab selected (submitted, credits, lifetime, modification)
 	 */
+	sortApplicationsByTabState(): void {
+		switch (this.tab_state) {
+			case TabStates.SUBMITTED:
+				this.all_applications.sort((a, b) => (
+					new Date(a.project_application_date_submitted).getTime()
+						- new Date(b.project_application_date_submitted).getTime()
+				));
+				break;
+
+			case TabStates.LIFETIME_EXTENSION:
+				this.all_applications.sort((a, b) => (
+					new Date(a.project_lifetime_request.date_submitted).getTime()
+						- new Date(b.project_lifetime_request.date_submitted).getTime()
+				));
+				break;
+
+			case TabStates.MODIFICATION_EXTENSION:
+				this.all_applications.sort((a, b) => (
+					new Date(a.project_modification_request.date_submitted).getTime()
+						- new Date(b.project_modification_request.date_submitted).getTime()
+				));
+				break;
+
+			case TabStates.CREDITS_EXTENSION:
+				this.all_applications.sort((a, b) => (
+					new Date(a.project_credit_request.date_submitted).getTime()
+						- new Date(b.project_credit_request.date_submitted).getTime()
+				));
+				break;
+
+			default:
+				break;
+		}
+	}
+
 	getApplicationsByTabState(): void {
 		this.loading_applications = true;
 		if (this.is_vo_admin) {
@@ -448,6 +483,8 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
 					for (const app of this.all_applications) {
 						this.getFacilityProject(app);
 					}
+					this.sortApplicationsByTabState();
+
 					this.isLoaded = true;
 					this.loading_applications = false;
 				});
@@ -462,6 +499,8 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
 					for (const app of this.all_applications) {
 						this.getFacilityProject(app);
 					}
+					this.sortApplicationsByTabState();
+
 					this.isLoaded = true;
 					this.loading_applications = false;
 				});
@@ -478,6 +517,8 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
 						for (const app of this.all_applications) {
 							this.getFacilityProject(app);
 						}
+						this.sortApplicationsByTabState();
+
 						this.isLoaded = true;
 						this.loading_applications = false;
 					});
@@ -494,6 +535,8 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
 						for (const app of this.all_applications) {
 							this.getFacilityProject(app);
 						}
+						this.sortApplicationsByTabState();
+
 						this.isLoaded = true;
 						this.loading_applications = false;
 					});

src/app/facility_manager/facilityprojectsoverview.component.html

@@ -523,7 +523,7 @@ <h4 class="modal-title" *ngIf="selectedFacility">
 														class="btn btn-danger"
 														id="remove_selected_member_for_mail_button"
 													>
-														<i class="fa fa-trash"></i> Remove
+														<i class="fas fa-trash-alt"></i> Remove
 													</button>
 												</td>
 											</tr>

src/app/layouts/full-layout.component.html

@@ -357,7 +357,7 @@
 					title="New Instance"
 					[routerLink]="['/virtualmachines/newVM']"
 				>
-					<i class="nav-icon fas fa-desktop"></i> New Instance</a
+					<i class="nav-icon fa-solid fa-desktop"></i> New Instance</a
 				>
 			</li>
 			<li class="nav-item" *ngIf="(is_vo_admin || cluster_allowed) && vm_project_member">