Skip to content

add compute offering details in UI #8563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 2 commits into from
Feb 8, 2024
Merged

add compute offering details in UI #8563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e85dcaa
add compute offering details in UI
DaanHoogland Jan 24, 2024
a4c7614
Pearl's sugestions
DaanHoogland Jan 24, 2024
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
8 changes: 7 additions & 1 deletion ui/src/components/view/DetailsTab.vue
View file
Open in desktop
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) && dataResource.serviceofferingdetails)">
<div>
<strong>{{ item === 'service' ? $t('label.supportedservices') : $t('label.' + String(item).toLowerCase()) }}</strong>
<br/>
Expand Down Expand Up @@ -91,6 +91,9 @@
</span>
</div>
</div>
<div v-else-if="$route.meta.name === 'computeoffering' && offeringDetails.includes(item)">
{{ dataResource.serviceofferingdetails[item] }}
</div>
<div v-else>{{ dataResource[item] }}</div>
</div>
</a-list-item>
Expand Down Expand Up @@ -255,6 +258,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
7 changes: 7 additions & 0 deletions ui/src/config/section/offering.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ export default {
store.getters.apis.createServiceOffering.params.filter(x => x.name === 'rootdisksize').length > 0) {
fields.splice(12, 0, 'rootdisksize')
}
const detailFields = ['minmemory', 'maxmemory', 'mincpunumber', 'maxcpunumber']
for (const field of detailFields) {
if (store.getters.apis.createServiceOffering &&
store.getters.apis.createServiceOffering.params.filter(x => field === x.name).length > 0) {
fields.push(field)
}
}
return fields
},
resourceType: 'ServiceOffering',
Expand Down