From aa618c25073d8320ffe7375bbd88a60d5e7cb3ae Mon Sep 17 00:00:00 2001 From: Brooklyn Date: Thu, 14 Mar 2024 11:23:31 +0100 Subject: [PATCH] Added "Allocated Space column" + application constants Signed-off-by: Brooklyn Dewolf --- .../ovirt/engine/ui/webadmin/ApplicationConstants.java | 2 ++ .../ui/webadmin/section/main/view/MainStorageView.java | 9 +++++++++ .../engine/ui/webadmin/ApplicationConstants.properties | 1 + 3 files changed, 12 insertions(+) diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index 6a773fc66f7..efd2484f238 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -1408,6 +1408,8 @@ public interface ApplicationConstants extends CommonApplicationConstants { String totalSpaceStorage(); + String allocatedSpaceStorage(); + String attachDataStorage(); String attachIsoStorage(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainStorageView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainStorageView.java index bb0266cbd1f..3b530c0eb5d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainStorageView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainStorageView.java @@ -160,6 +160,15 @@ public SafeHtml getTooltip(StorageDomain object) { }; getTable().addColumn(confirmedFreeSpaceColumn, constants.confirmedFreeSpaceStorage(), "180px"); //$NON-NLS-1$ + AbstractStorageSizeColumn allocatedSpaceColumn = new AbstractStorageSizeColumn() { + @Override + public Long getRawValue(StorageDomain object) { + Integer allocatedSpace = object.getCommittedDiskSize(); + return allocatedSpace == null ? null : Long.valueOf(allocatedSpace); + } + }; + getTable().addColumn(allocatedSpaceColumn, constants.allocatedSpaceStorage(), "130px"); //$NON-NLS-1$ + AbstractTextColumn descriptionColumn = new AbstractTextColumn() { @Override public String getValue(StorageDomain object) { diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants.properties index 9e239e0d891..422b49eb7e3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants.properties @@ -641,6 +641,7 @@ freeSpaceDisksTree=Free Space freeSpaceGBVolumeBrick=Free Space (GB) freeSpaceStorage=Free Space (GB) confirmedFreeSpaceStorage=Guaranteed Free Space (GB) +allocatedSpaceStorage=Allocated Space (GB) confirmedFreeSpaceStorageNonThinTooltip=This storage domain is not thin provisioned, so all free space is available for use. confirmedFreeSpaceStorageThinTooltip=This storage domain lies on a thin provisioned device, which means that not all of the free space may be available for use; however, you are guaranteed to be able to use at least this amount. freeStorage=Free Storage