Skip to content

Commit 7c196d9

Browse files
committed
Remove empty object on the data pool details of storage pools with no data pool
1 parent 4c74326 commit 7c196d9

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

ui/src/components/view/DetailsTab.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,7 @@
4242
size="small"
4343
:dataSource="fetchDetails()">
4444
<template #renderItem="{item}">
45-
<a-list-item v-if="$route.meta.name === 'storagepool' && item === 'details' && dataResource[item].rbd_default_data_pool">
46-
<div>
47-
<strong>{{ $t('label.data.pool') }}</strong>
48-
<br/>
49-
<div>{{ dataResource[item].rbd_default_data_pool }}</div>
50-
</div>
51-
</a-list-item>
52-
<a-list-item v-else-if="(item in dataResource && !customDisplayItems.includes(item)) || (offeringDetails.includes(item) && dataResource.serviceofferingdetails)">
45+
<a-list-item v-if="(item in dataResource && !customDisplayItems.includes(item)) || (offeringDetails.includes(item) && dataResource.serviceofferingdetails)">
5346
<div style="width: 100%">
5447
<strong>{{ item === 'service' ? $t('label.supportedservices') : $t(getDetailTitle(item)) }}</strong>
5548
<br/>
@@ -158,6 +151,13 @@
158151
<div>{{ $toLocaleDate(dataResource[item]) }}</div>
159152
</div>
160153
</a-list-item>
154+
<a-list-item v-else-if="item === 'details' && $route.meta.name === 'storagepool' && dataResource[item].rbd_default_data_pool">
155+
<div>
156+
<strong>{{ $t('label.data.pool') }}</strong>
157+
<br/>
158+
<div>{{ dataResource[item].rbd_default_data_pool }}</div>
159+
</div>
160+
</a-list-item>
161161
</template>
162162
<HostInfo :resource="dataResource" v-if="$route.meta.name === 'host' && 'listHosts' in $store.getters.apis" />
163163
<DedicateData :resource="dataResource" v-if="dedicatedSectionActive" />
@@ -214,7 +214,7 @@ export default {
214214
},
215215
computed: {
216216
customDisplayItems () {
217-
var items = ['ip4routes', 'ip6routes', 'privatemtu', 'publicmtu', 'provider']
217+
var items = ['ip4routes', 'ip6routes', 'privatemtu', 'publicmtu', 'provider', 'details']
218218
if (this.$route.meta.name === 'webhookdeliveries') {
219219
items.push('startdate')
220220
items.push('enddate')

0 commit comments

Comments
 (0)