Merge branch 'master' into staging

deNBI · Jul 25, 2023 · 2305886 · 2305886
2 parents 18c3162 + 248bba1
commit 2305886
Showing 1 changed file with 10 additions and 15 deletions.
diff --git a/src/app/virtualmachines/volumes/volumeOverview.component.html b/src/app/virtualmachines/volumes/volumeOverview.component.html
@@ -195,7 +195,7 @@
 
 					<div class="rTableCell">{{ volume?.volume_storage }} GB</div>
 					<div class="rTableCell">
-						<div *ngIf="!(volume.volume_projectid | isMigratedProjectId : migratedProjectIds)">
+						<div *ngIf="!(volume.volume_projectid | isMigratedProjectId: migratedProjectIds)">
 							<div
 								*ngIf="
 									(volume?.volume_created_by_user || showFacilities) &&
@@ -221,21 +221,15 @@
 									aria-controls="dropdown-split"
 								></button>
 								<ul class="dropdown-menu" style="cursor: pointer" role="menu" *dropdownMenu>
-									<li
-										*ngIf="volume?.volume_virtualmachine && volume?.volume_status !== VolumeStates.staticERROR"
-										role="menuitem"
-									>
+									<li *ngIf="volume?.volume_status === VolumeStates.staticIN_USE" role="menuitem">
 										<a
 											class="dropdown-item"
 											(click)="setRequestStatus(1); setSelectedVolume(volume); verifyModal.show()"
 											>Detach Volume</a
 										>
 									</li>
 
-									<li
-										*ngIf="!volume?.volume_virtualmachine && volume?.volume_status !== VolumeStates.staticERROR"
-										role="menuitem"
-									>
+									<li *ngIf="volume?.volume_status === VolumeStates.staticAVAILABLE" role="menuitem">
 										<a
 											class="dropdown-item"
 											(click)="
@@ -244,7 +238,7 @@
 											>Attach Volume</a
 										>
 									</li>
-									<li *ngIf="volume?.volume_status !== VolumeStates.staticERROR" role="menuitem">
+									<li *ngIf="volume?.volume_status === VolumeStates.staticAVAILABLE" role="menuitem">
 										<a
 											class="dropdown-item"
 											(click)="
@@ -262,15 +256,15 @@
 								</ul>
 							</div>
 						</div>
-						<div *ngIf="volume.volume_projectid | isMigratedProjectId : migratedProjectIds">
+						<div *ngIf="volume.volume_projectid | isMigratedProjectId: migratedProjectIds">
 							<div class="alert alert-info">This volume is part of a migrated project!</div>
 						</div>
 					</div>
 					<div class="rTableCell">
 						<input
 							type="checkbox"
-							[disabled]="volume.volume_projectid | isMigratedProjectId : migratedProjectIds"
-							[checked]="isVolChecked(volume) && !(volume.volume_projectid | isMigratedProjectId : migratedProjectIds)"
+							[disabled]="volume.volume_projectid | isMigratedProjectId: migratedProjectIds"
+							[checked]="isVolChecked(volume) && !(volume.volume_projectid | isMigratedProjectId: migratedProjectIds)"
 							(change)="changeCheckedVolume(volume)"
 							*ngIf="
 								(volume?.volume_created_by_user || showFacilities) &&
@@ -506,7 +500,8 @@ <h4 class="modal-title">Detach the following Volumes</h4>
 					Are you sure you want to detach:
 					<div *ngFor="let volume of checked_volumes">
 						<ng-container *ngIf="volume?.volume_virtualmachine?.openstackid">
-							<strong>{{ volume?.volume_name }}</strong> from <strong>{{ volume?.volume_virtualmachine?.name }}</strong>
+							<strong>{{ volume?.volume_name }}</strong> from
+							<strong>{{ volume?.volume_virtualmachine?.name }}</strong>
 						</ng-container>
 					</div>
 				</div>
@@ -932,7 +927,7 @@ <h4 class="modal-title">Create & Attach Volume</h4>
 							<option value="undefined" disabled selected hidden>Please Select</option>
 							<option
 								*ngFor="let project of projects"
-								[disabled]="project[1] | isMigratedProjectId : migratedProjectIds"
+								[disabled]="project[1] | isMigratedProjectId: migratedProjectIds"
 								[ngValue]="project"
 								id="project_option_{{ project[0] }}"
 							>