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 19e9020c9bb ui: fix dashboard retrievals based on permissions (#9237)
19e9020c9bb is described below
commit 19e9020c9bbbb65a97ea51bf7efd3d39fceaf486
Author: Abhishek Kumar <abhishek.mr...@gmail.com>
AuthorDate: Thu Jun 13 13:53:44 2024 +0530
ui: fix dashboard retrievals based on permissions (#9237)
Signed-off-by: Abhishek Kumar <abhishek.mr...@gmail.com>
---
ui/src/views/dashboard/UsageDashboard.vue | 106 +++++++++++++++++++-----------
1 file changed, 66 insertions(+), 40 deletions(-)
diff --git a/ui/src/views/dashboard/UsageDashboard.vue
b/ui/src/views/dashboard/UsageDashboard.vue
index fe835cbd0d0..9df3b38c6a9 100644
--- a/ui/src/views/dashboard/UsageDashboard.vue
+++ b/ui/src/views/dashboard/UsageDashboard.vue
@@ -51,7 +51,7 @@
</template>
<a-divider style="margin: 6px 0px; border-width: 0px"/>
<a-row :gutter="[10, 10]">
- <a-col :span="12">
+ <a-col :span="12" v-if="'listVirtualMachines' in
$store.getters.apis">
<router-link :to="{ path: '/vm' }">
<a-statistic
:title="$t('label.instances')"
@@ -63,7 +63,7 @@
</a-statistic>
</router-link>
</a-col>
- <a-col :span="12">
+ <a-col :span="12" v-if="'listKubernetesClusters' in
$store.getters.apis">
<router-link :to="{ path: '/kubernetes' }">
<a-statistic
:title="$t('label.kubernetes.cluster')"
@@ -75,7 +75,7 @@
</a-statistic>
</router-link>
</a-col>
- <a-col :span="12">
+ <a-col :span="12" v-if="'listVolumes' in $store.getters.apis">
<router-link :to="{ path: '/volume' }">
<a-statistic
:title="$t('label.volumes')"
@@ -87,7 +87,7 @@
</a-statistic>
</router-link>
</a-col>
- <a-col :span="12">
+ <a-col :span="12" v-if="'listSnapshots' in $store.getters.apis">
<router-link :to="{ path: '/snapshot' }">
<a-statistic
:title="$t('label.snapshots')"
@@ -99,7 +99,7 @@
</a-statistic>
</router-link>
</a-col>
- <a-col :span="12">
+ <a-col :span="12" v-if="'listNetworks' in $store.getters.apis">
<router-link :to="{ path: '/guestnetwork' }">
<a-statistic
:title="$t('label.guest.networks')"
@@ -111,7 +111,7 @@
</a-statistic>
</router-link>
</a-col>
- <a-col :span="12">
+ <a-col :span="12" v-if="'listVPCs' in $store.getters.apis">
<router-link :to="{ path: '/vpc' }">
<a-statistic
:title="$t('label.vpcs')"
@@ -123,7 +123,7 @@
</a-statistic>
</router-link>
</a-col>
- <a-col :span="12">
+ <a-col :span="12" v-if="'listPublicIpAddresses' in
$store.getters.apis">
<router-link :to="{ path: '/publicip' }">
<a-statistic
:title="$t('label.public.ips')"
@@ -135,7 +135,7 @@
</a-statistic>
</router-link>
</a-col>
- <a-col :span="12">
+ <a-col :span="12" v-if="'listTemplates' in $store.getters.apis">
<router-link :to="{ path: '/template', query: { templatefilter:
'self', filter: 'self' } }">
<a-statistic
:title="$t('label.templates')"
@@ -150,7 +150,7 @@
</a-row>
</chart-card>
</a-col>
- <a-col :xs="{ span: 24 }" :lg="{ span: 12 }" :xl="{ span: 8 }" :xxl="{
span: 8 }">
+ <a-col :xs="{ span: 24 }" :lg="{ span: 12 }" :xl="{ span: 8 }" :xxl="{
span: 8 }" v-if="'listVirtualMachines' in $store.getters.apis">
<chart-card :loading="loading" class="dashboard-card">
<template #title>
<div class="center">
@@ -315,7 +315,7 @@
</a-list>
</chart-card>
</a-col>
- <a-col :xs="{ span: 24 }" :lg="{ span: 12 }" :xl="{ span: 8 }" :xxl="{
span: 8 }">
+ <a-col :xs="{ span: 24 }" :lg="{ span: 12 }" :xl="{ span: 8 }" :xxl="{
span: 8 }" v-if="'listEvents' in $store.getters.apis">
<chart-card :loading="loading" class="dashboard-card dashboard-event">
<template #title>
<div class="center">
@@ -482,37 +482,60 @@ export default {
}
this.listInstances()
this.listEvents()
- this.loading = true
- api('listKubernetesClusters', { listall: true, page: 1, pagesize: 1
}).then(json => {
- this.loading = false
- this.data.kubernetes = json?.listkubernetesclustersresponse?.count
- })
- api('listVolumes', { listall: true, page: 1, pagesize: 1 }).then(json =>
{
- this.loading = false
- this.data.volumes = json?.listvolumesresponse?.count
- })
- api('listSnapshots', { listall: true, page: 1, pagesize: 1 }).then(json
=> {
- this.loading = false
- this.data.snapshots = json?.listsnapshotsresponse?.count
- })
- api('listNetworks', { listall: true, page: 1, pagesize: 1 }).then(json
=> {
- this.loading = false
- this.data.networks = json?.listnetworksresponse?.count
- })
- api('listVPCs', { listall: true, page: 1, pagesize: 1 }).then(json => {
- this.loading = false
- this.data.vpcs = json?.listvpcsresponse?.count
- })
- api('listPublicIpAddresses', { listall: true, page: 1, pagesize: 1
}).then(json => {
- this.loading = false
- this.data.ips = json?.listpublicipaddressesresponse?.count
- })
- api('listTemplates', { templatefilter: 'self', listall: true, page: 1,
pagesize: 1 }).then(json => {
- this.loading = false
- this.data.templates = json?.listtemplatesresponse?.count
- })
+ if ('listKubernetesClusters' in this.$store.getters.apis) {
+ this.loading = true
+ api('listKubernetesClusters', { listall: true, page: 1, pagesize: 1
}).then(json => {
+ this.loading = false
+ this.data.kubernetes = json?.listkubernetesclustersresponse?.count
+ })
+ }
+ if ('listVolumes' in this.$store.getters.apis) {
+ this.loading = true
+ api('listVolumes', { listall: true, page: 1, pagesize: 1 }).then(json
=> {
+ this.loading = false
+ this.data.volumes = json?.listvolumesresponse?.count
+ })
+ }
+ if ('listSnapshots' in this.$store.getters.apis) {
+ this.loading = true
+ api('listSnapshots', { listall: true, page: 1, pagesize: 1
}).then(json => {
+ this.loading = false
+ this.data.snapshots = json?.listsnapshotsresponse?.count
+ })
+ }
+ if ('listNetworks' in this.$store.getters.apis) {
+ this.loading = true
+ api('listNetworks', { listall: true, page: 1, pagesize: 1 }).then(json
=> {
+ this.loading = false
+ this.data.networks = json?.listnetworksresponse?.count
+ })
+ }
+ if ('listVPCs' in this.$store.getters.apis) {
+ this.loading = true
+ api('listVPCs', { listall: true, page: 1, pagesize: 1 }).then(json => {
+ this.loading = false
+ this.data.vpcs = json?.listvpcsresponse?.count
+ })
+ }
+ if ('listPublicIpAddresses' in this.$store.getters.apis) {
+ this.loading = true
+ api('listPublicIpAddresses', { listall: true, page: 1, pagesize: 1
}).then(json => {
+ this.loading = false
+ this.data.ips = json?.listpublicipaddressesresponse?.count
+ })
+ }
+ if ('listTemplates' in this.$store.getters.apis) {
+ this.loading = true
+ api('listTemplates', { templatefilter: 'self', listall: true, page: 1,
pagesize: 1 }).then(json => {
+ this.loading = false
+ this.data.templates = json?.listtemplatesresponse?.count
+ })
+ }
},
- listInstances (zone) {
+ listInstances () {
+ if (!('listVirtualMachines' in this.$store.getters.apis)) {
+ return
+ }
this.loading = true
api('listVirtualMachines', { listall: true, details: 'min', page: 1,
pagesize: 1 }).then(json => {
this.loading = false
@@ -528,6 +551,9 @@ export default {
})
},
listEvents () {
+ if (!('listEvents' in this.$store.getters.apis)) {
+ return
+ }
const params = {
page: 1,
pagesize: 8,
