Merge pull request #6113 from deNBI/dev

Dev
deNBI · Jul 9, 2024 · 42fb0a9 · 42fb0a9
2 parents 1edcdfc + 84f9717
commit 42fb0a9
Show file tree

Hide file tree

Showing 10 changed files with 1,468 additions and 1,776 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@denbi/cloud-portal-webapp",
-    "version": "4.847.0",
+    "version": "4.848.0",
     "description": "de.NBI Cloud Portal",
     "scripts": {
         "ng": "ng serve",
@@ -124,7 +124,7 @@
         "webpack-cli": "5.1.4"
     },
     "overrides": {
-        "undici": "6.15.0",
+        "undici": "6.19.2",
         "vite": "5.2.12"
     },
     "lint-staged": {

diff --git a/src/app/applications/application-card/application-card.component.html b/src/app/applications/application-card/application-card.component.html
@@ -1,46 +1,49 @@
 <tr>
-	<td>
-		<app-application-badges [application]="application"></app-application-badges>
-	</td>
-	<td>{{ application?.project_application_name }}</td>
-	<td>{{ application?.project_application_shortname }}</td>
-	<td>{{ application?.project_application_date_submitted }}</td>
-	<td style="word-wrap: break-word; min-width: 110px; max-width: 130px; white-space: normal">
-		@if (application?.project_application_user?.username) {
-			{{ application?.project_application_user?.username }}
-		} @else {
-			<span class="spinner-border text-info"></span>
-		}
-	</td>
-	<td>{{ application?.project_application_institute }}</td>
+    <td>
+        <app-application-badges [application]="application"></app-application-badges>
+    </td>
+    <td>{{ application?.project_application_name }}</td>
+    <td>{{ application?.project_application_shortname }}</td>
+    <td>{{ application?.project_application_date_submitted }}</td>
+    <td style="word-wrap: break-word; min-width: 110px; max-width: 130px; white-space: normal">
+        @if (application?.project_application_user?.username) {
+            {{ application?.project_application_user?.username }}
+        } @else {
+            <span class="spinner-border text-info"></span>
+        }
+    </td>
+    <td>{{ application?.project_application_institute }}</td>
 
-	@if (voView) {
-		<app-application-vo-actions
-			(switchCollapseEvent)="switchCollaps()"
-			class="table-line"
-			[application]="application"
-			[tabState]="tabState"
-			[computeCenters]="computeCenters"
-			(reloadNumbersTrigger)="triggerReloadNumbers()"
-			(removeApplicationTrigger)="triggerRemoveApplication()"
-		></app-application-vo-actions>
-	} @else if (facilityView) {
-		<app-application-facility-actions
-			(switchCollapseEvent)="switchCollaps()"
-			class="table-line"
-			[application]="application"
-			[tabState]="tabState"
-			(reloadNumbersTrigger)="triggerReloadNumbers()"
-			(removeApplicationTrigger)="triggerRemoveApplication()"
-		></app-application-facility-actions>
-	}
+    @if (voView) {
+        <app-application-vo-actions
+                (switchCollapseEvent)="switchCollaps()"
+                class="table-line"
+                [application]="application"
+                [tabState]="tabState"
+                [computeCenters]="computeCenters"
+                (reloadNumbersTrigger)="triggerReloadNumbers()"
+                (removeApplicationTrigger)="triggerRemoveApplication()"
+                (reloadApplicationTrigger)="getApplication()"
+        ></app-application-vo-actions>
+    } @else if (facilityView) {
+        <app-application-facility-actions
+                (switchCollapseEvent)="switchCollaps()"
+                class="table-line"
+                [application]="application"
+                [tabState]="tabState"
+                (reloadNumbersTrigger)="triggerReloadNumbers()"
+                (removeApplicationTrigger)="triggerRemoveApplication()"
+                (reloadApplicationTrigger)="getApplication()"
+
+        ></app-application-facility-actions>
+    }
 </tr>
 <td colspan="12">
-	@if (!isCollapsed) {
-		<app-application-detail
-			[class.collapse_no_margin]="isCollapsed"
-			[class.collapse]="isCollapsed"
-			[application]="application"
-		></app-application-detail>
-	}
+    @if (!isCollapsed) {
+        <app-application-detail #applicationdetail
+                                [class.collapse_no_margin]="isCollapsed"
+                                [class.collapse]="isCollapsed"
+                                [application]="application"
+        ></app-application-detail>
+    }
 </td>