Skip to content

Commit bb70da0

Browse files
authored
add compute offering details in UI (#8563)
* add compute offering details in UI * Pearl's sugestions
1 parent 0447040 commit bb70da0

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

ui/src/components/view/DetailsTab.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
size="small"
3838
:dataSource="fetchDetails()">
3939
<template #renderItem="{item}">
40-
<a-list-item v-if="item in dataResource && !customDisplayItems.includes(item)">
40+
<a-list-item v-if="(item in dataResource && !customDisplayItems.includes(item)) || (offeringDetails.includes(item) && dataResource.serviceofferingdetails)">
4141
<div>
4242
<strong>{{ item === 'service' ? $t('label.supportedservices') : $t('label.' + String(item).toLowerCase()) }}</strong>
4343
<br/>
@@ -91,6 +91,9 @@
9191
</span>
9292
</div>
9393
</div>
94+
<div v-else-if="$route.meta.name === 'computeoffering' && offeringDetails.includes(item)">
95+
{{ dataResource.serviceofferingdetails[item] }}
96+
</div>
9497
<div v-else>{{ dataResource[item] }}</div>
9598
</div>
9699
</a-list-item>
@@ -255,6 +258,9 @@ export default {
255258
}
256259
return null
257260
},
261+
offeringDetails () {
262+
return ['maxcpunumber', 'mincpunumber', 'minmemory', 'maxmemory']
263+
},
258264
ipV6Address () {
259265
if (this.dataResource.nic && this.dataResource.nic.length > 0) {
260266
return this.dataResource.nic.filter(e => { return e.ip6address }).map(e => { return e.ip6address }).join(', ')

ui/src/config/section/offering.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ export default {
4747
store.getters.apis.createServiceOffering.params.filter(x => x.name === 'rootdisksize').length > 0) {
4848
fields.splice(12, 0, 'rootdisksize')
4949
}
50+
const detailFields = ['minmemory', 'maxmemory', 'mincpunumber', 'maxcpunumber']
51+
for (const field of detailFields) {
52+
if (store.getters.apis.createServiceOffering &&
53+
store.getters.apis.createServiceOffering.params.filter(x => field === x.name).length > 0) {
54+
fields.push(field)
55+
}
56+
}
5057
return fields
5158
},
5259
resourceType: 'ServiceOffering',

0 commit comments

Comments
 (0)