This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new 7721133ea9a Fix display of properties related to backup size (#8845)
7721133ea9a is described below
commit 7721133ea9a2f68ad3d8402cd366225114bbb5e5
Author: Bernardo De Marco Gonçalves <bernardomg2...@gmail.com>
AuthorDate: Tue Apr 16 11:58:36 2024 -0300
Fix display of properties related to backup size (#8845)
---
ui/src/components/view/DetailsTab.vue | 9 +++++++++
ui/src/components/view/InfoCard.vue | 12 +++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/ui/src/components/view/DetailsTab.vue
b/ui/src/components/view/DetailsTab.vue
index b04830b3c3c..00aa92389c9 100644
--- a/ui/src/components/view/DetailsTab.vue
+++ b/ui/src/components/view/DetailsTab.vue
@@ -46,6 +46,15 @@
{{ service.name }} : {{ service.provider[0].name }}
</div>
</div>
+ <div v-else-if="$route.meta.name === 'backup' && (item === 'size' ||
item === 'virtualsize')">
+ {{ $bytesToHumanReadableSize(dataResource[item]) }}
+ <a-tooltip placement="right">
+ <template #title>
+ {{ dataResource[item] }} bytes
+ </template>
+ <QuestionCircleOutlined />
+ </a-tooltip>
+ </div>
<div v-else-if="$route.meta.name === 'backup' && item === 'volumes'">
<div v-for="(volume, idx) in JSON.parse(dataResource[item])"
:key="idx">
<router-link :to="{ path: '/volume/' + volume.uuid }">{{
volume.type }} - {{ volume.path }}</router-link> ({{ parseFloat(volume.size /
(1024.0 * 1024.0 * 1024.0)).toFixed(1) }} GB)
diff --git a/ui/src/components/view/InfoCard.vue
b/ui/src/components/view/InfoCard.vue
index 69c40233d08..66c878da0f8 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -290,10 +290,20 @@
</div>
</div>
<div class="resource-detail-item" v-if="resource.volumes ||
resource.sizegb">
- <div class="resource-detail-item__label">{{ $t('label.disksize')
}}</div>
+ <div class="resource-detail-item__label" v-if="$route.meta.name ===
'backup'">{{ $t('label.size') }}</div>
+ <div class="resource-detail-item__label" v-else>{{
$t('label.disksize') }}</div>
<div class="resource-detail-item__details">
<hdd-outlined />
<span style="width: 100%;" v-if="$route.meta.name === 'vm' &&
resource.volumes">{{ (resource.volumes.reduce((total, item) => total +=
item.size, 0) / (1024 * 1024 * 1024.0)).toFixed(2) }} GB Storage</span>
+ <span style="width: 100%;" v-else-if="$route.meta.name ===
'backup'">
+ {{ $bytesToHumanReadableSize(resource.size) }}
+ <a-tooltip placement="right">
+ <template #title>
+ {{ resource.size }} bytes
+ </template>
+ <QuestionCircleOutlined />
+ </a-tooltip>
+ </span>
<span style="width: 100%;" v-else-if="resource.sizegb ||
resource.size">{{ resource.sizegb || (resource.size/1024.0) }}</span>
</div>
<div style="margin-left: 25px; margin-top: 5px"
v-if="resource.diskkbsread && resource.diskkbswrite && resource.diskioread &&
resource.diskiowrite">
