Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ui/src/components/view/DetailsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
size="small"
:dataSource="fetchDetails()">
<template #renderItem="{item}">
<a-list-item v-if="item in dataResource && !customDisplayItems.includes(item)">
<a-list-item v-if="item in dataResource && !customDisplayItems.includes(item) || offeringDetails.includes(item)">
Comment thread
DaanHoogland marked this conversation as resolved.
Outdated
<div>
<strong>{{ item === 'service' ? $t('label.supportedservices') : $t('label.' + String(item).toLowerCase()) }}</strong>
<br/>
Expand Down Expand Up @@ -91,6 +91,18 @@
</span>
</div>
</div>
<div v-else-if="$route.meta.name === 'computeoffering' && item === 'mincpunumber' && dataResource.serviceofferingdetails">
{{ dataResource.serviceofferingdetails.mincpunumber }}
</div>
<div v-else-if="$route.meta.name === 'computeoffering' && item === 'maxcpunumber' && dataResource.serviceofferingdetails">
{{ dataResource.serviceofferingdetails.maxcpunumber }}
</div>
<div v-else-if="$route.meta.name === 'computeoffering' && item === 'minmemory' && dataResource.serviceofferingdetails">
{{ dataResource.serviceofferingdetails.minmemory }}
</div>
<div v-else-if="$route.meta.name === 'computeoffering' && item === 'maxmemory' && dataResource.serviceofferingdetails">
{{ dataResource.serviceofferingdetails.maxmemory }}
</div>
Comment thread
DaanHoogland marked this conversation as resolved.
Outdated
<div v-else>{{ dataResource[item] }}</div>
</div>
</a-list-item>
Expand Down Expand Up @@ -255,6 +267,9 @@ export default {
}
return null
},
offeringDetails () {
return ['maxcpunumber', 'mincpunumber', 'minmemory', 'maxmemory']
},
ipV6Address () {
if (this.dataResource.nic && this.dataResource.nic.length > 0) {
return this.dataResource.nic.filter(e => { return e.ip6address }).map(e => { return e.ip6address }).join(', ')
Expand Down
16 changes: 16 additions & 0 deletions ui/src/config/section/offering.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,22 @@ export default {
store.getters.apis.createServiceOffering.params.filter(x => x.name === 'rootdisksize').length > 0) {
fields.splice(12, 0, 'rootdisksize')
}
if (store.getters.apis.createServiceOffering &&
store.getters.apis.createServiceOffering.params.filter(x => x.name === 'mincpunumber').length > 0) {
fields.push('mincpunumber')
}
if (store.getters.apis.createServiceOffering &&
store.getters.apis.createServiceOffering.params.filter(x => x.name === 'maxcpunumber').length > 0) {
fields.push('maxcpunumber')
}
if (store.getters.apis.createServiceOffering &&
store.getters.apis.createServiceOffering.params.filter(x => x.name === 'minmemory').length > 0) {
fields.push('minmemory')
}
if (store.getters.apis.createServiceOffering &&
store.getters.apis.createServiceOffering.params.filter(x => x.name === 'maxmemory').length > 0) {
fields.push('maxmemory')
}
Comment thread
DaanHoogland marked this conversation as resolved.
Outdated
return fields
},
resourceType: 'ServiceOffering',
Expand Down