Merge branch 'dev' into staging

deNBI · Jul 24, 2024 · 5f49a16 · 5f49a16
2 parents 6e5e08b + 7bddcb8
commit 5f49a16
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 15 deletions.
diff --git a/src/app/applications/application-detail/adjustment-detail/adjustment-detail.component.html b/src/app/applications/application-detail/adjustment-detail/adjustment-detail.component.html
@@ -3,7 +3,7 @@
 		<tr>
 			<td>Comment by reviewer:</td>
 			<td>
-				{{ application?.project_application_manager_comment }}
+				{{ comment }}
 			</td>
 		</tr>
 	</tbody>

diff --git a/src/app/applications/application-detail/adjustment-detail/adjustment-detail.component.ts b/src/app/applications/application-detail/adjustment-detail/adjustment-detail.component.ts
@@ -1,5 +1,4 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Application } from '../../application.model/application.model';
 import { is_vo, elixir_id } from '../../../shared/globalvar';
 
 /**
@@ -10,11 +9,9 @@ import { is_vo, elixir_id } from '../../../shared/globalvar';
 	templateUrl: './adjustment-detail.component.html',
 })
 export class AdjustmentDetailComponent implements OnInit {
-	@Input() application: Application;
 	is_vo: boolean = is_vo;
+	@Input() comment: string;
 	elixir_id: string = elixir_id;
 
-	ngOnInit() {
-
-	}
+	ngOnInit() {}
 }
diff --git a/src/app/applications/application-detail/application-detail.component.html b/src/app/applications/application-detail/application-detail.component.html
@@ -58,6 +58,26 @@
 				>Application Adjustment</a
 			>
 		</li>
+		<li class="nav-item">
+			<a
+				class="nav-link"
+				id="modification_comment_tab"
+				*ngIf="application?.project_modification_request?.manager_comment"
+				[ngClass]="{ active: MODIFICATION_COMMENT_TAB_ACTIVE }"
+				(click)="setTab(MODIFICATION_COMMENT_TAB)"
+				>Modification Adjustment</a
+			>
+		</li>
+		<li class="nav-item">
+			<a
+				class="nav-link"
+				id="lifetime_comment_tab"
+				*ngIf="application?.project_lifetime_request?.manager_comment"
+				[ngClass]="{ active: LIFETIME_COMMENT_TAB_ACTIVE }"
+				(click)="setTab(LIFETIME_COMMENT_TAB)"
+				>Lifetime Adjustment</a
+			>
+		</li>
 	</ul>
 
 	<div class="tab-content">
@@ -99,8 +119,22 @@
 			<app-lifetime-extension-detail [application]="application"></app-lifetime-extension-detail>
 		</div>
 
-		<div *ngIf="COMMENT_TAB_ACTIVE" class="table-responsive">
-			<app-adjustment-detail [application]="application"></app-adjustment-detail>
-		</div>
+		@if (COMMENT_TAB_ACTIVE) {
+			<div class="table-responsive">
+				<app-adjustment-detail [comment]="application.project_application_manager_comment"></app-adjustment-detail>
+			</div>
+		} @else if (MODIFICATION_COMMENT_TAB_ACTIVE) {
+			<div class="table-responsive">
+				<app-adjustment-detail
+					[comment]="application?.project_modification_request?.manager_comment"
+				></app-adjustment-detail>
+			</div>
+		} @else if (LIFETIME_COMMENT_TAB_ACTIVE) {
+			<div class="table-responsive">
+				<app-adjustment-detail
+					[comment]="application?.project_lifetime_request?.manager_comment"
+				></app-adjustment-detail>
+			</div>
+		}
 	</div>
 </div>
diff --git a/src/app/applications/application-detail/application-detail.component.ts b/src/app/applications/application-detail/application-detail.component.ts
@@ -28,14 +28,17 @@ export class ApplicationDetailComponent extends ApplicationBaseClassComponent im
 	MODIFICATION_TAB: number = 4;
 	EXTENSION_TAB: number = 5;
 	COMMENT_TAB: number = 6;
+	MODIFICATION_COMMENT_TAB: number = 7;
+	LIFETIME_COMMENT_TAB: number = 8;
 	PI_USER_TAB_ACTIVE: boolean = true;
 	INFORMATION_TAB_ACTIVE: boolean = false;
 	RESOURCE_TAB_ACTIVE: boolean = false;
 	CREDITS_TAB_ACTIVE: boolean = false;
 	MODIFICATION_TAB_ACTIVE: boolean = false;
 	EXTENSION_TAB_ACTIVE: boolean = false;
 	COMMENT_TAB_ACTIVE: boolean = false;
-
+	MODIFICATION_COMMENT_TAB_ACTIVE: boolean = false;
+	LIFETIME_COMMENT_TAB_ACTIVE: boolean = false;
 	@Input() application: Application;
 	@Input() default_tab: number = this.PI_USER_TAB;
 
@@ -52,10 +55,13 @@ export class ApplicationDetailComponent extends ApplicationBaseClassComponent im
 		this.MODIFICATION_TAB_ACTIVE = false;
 		this.EXTENSION_TAB_ACTIVE = false;
 		this.COMMENT_TAB_ACTIVE = false;
+		this.MODIFICATION_COMMENT_TAB_ACTIVE = false;
+		this.LIFETIME_COMMENT_TAB_ACTIVE = false;
 	}
 
 	setTab(tab_num: number): void {
 		this.setAllTabsFalse();
+		console.log(tab_num);
 		switch (tab_num) {
 			case this.PI_USER_TAB:
 				this.PI_USER_TAB_ACTIVE = true;
@@ -78,6 +84,12 @@ export class ApplicationDetailComponent extends ApplicationBaseClassComponent im
 			case this.COMMENT_TAB:
 				this.COMMENT_TAB_ACTIVE = true;
 				break;
+			case this.LIFETIME_COMMENT_TAB:
+				this.LIFETIME_COMMENT_TAB_ACTIVE = true;
+				break;
+			case this.MODIFICATION_COMMENT_TAB:
+				this.MODIFICATION_COMMENT_TAB_ACTIVE = true;
+				break;
 			default:
 				break;
 		}

diff --git a/src/app/applications/application-vo-actions/application-vo-actions.component.ts b/src/app/applications/application-vo-actions/application-vo-actions.component.ts
@@ -467,6 +467,8 @@ export class ApplicationVoActionsComponent extends AbstractBaseClass implements
 					}
 				}
 				if (action === 'adjustedModificationRequest') {
+					this.triggerReloadApplication();
+
 					//	this.isLoaded = false;
 					// this.changeTabState(ApplicationTabStates.MODIFICATION_EXTENSION);
 				}

diff --git a/src/app/applications/type-overview.component.html b/src/app/applications/type-overview.component.html
@@ -235,8 +235,8 @@
 									<button
 										data-test-id="newKuberntesBtn"
 										id="newKubernetesBtn"
-										class="btn btn-outline-openstack"
-										style="border-color: {{ kubernetes_color }} !important; color:{{ kubernetes_color }} !important "
+										class="btn btn-outline-kubernetes"
+										style="border-color: {{ kubernetes_color }} !important;"
 									>
 										New Kubernetes Application
 									</button>
@@ -279,7 +279,7 @@
 								</div>
 								<div class="col-9">
 									<strong>Configurability</strong> – Kubernetes allows the configuration of any resource type available,
-									such as virtual machines, network.
+									such as containers and network.
 								</div>
 							</div>
 							<br />

diff --git a/.../email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html b/.../email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html
@@ -1,5 +1,5 @@
 <div class="modal-header">
-	<h4 class="modal-title" data-test-id="confirmation_modal_title">Sent Mail to specific projects</h4>
+	<h4 class="modal-title" data-test-id="confirmation_modal_title">Send Mail to specific projects</h4>
 	<button
 		type="button"
 		class="btn-close"

diff --git a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html
@@ -1,5 +1,5 @@
 <div class="modal-header">
-	<h4 class="modal-title" data-test-id="confirmation_modal_title">Sent Mail to specific projects</h4>
+	<h4 class="modal-title" data-test-id="confirmation_modal_title">Send Mail to specific projects</h4>
 	<button
 		type="button"
 		class="btn-close"

diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss
@@ -318,6 +318,7 @@ $slight_danger_persian_red: #CA3433;
 
 $openstackcolour: #ED1944;
 $simplevmcolour: #00ADEF;
+$kubernetescolor: #326ce5;
 
 
 @media (max-width: 992px) {
@@ -974,6 +975,10 @@ header {
     @include button-outline-variant($simplevmcolour, #222222, lighten($simplevmcolour, 5%), $simplevmcolour);
 }
 
+.btn-outline-kubernetes {
+    @include button-outline-variant($kubernetescolor, #222222, lighten($kubernetescolor, 5%), $kubernetescolor);
+}
+
 // Google Font as on landing page.
 .app-body {
     color: $deNBI_darkgrey;