This is an automated email from the ASF dual-hosted git repository. nvazquez pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push: new 0898876 ui: Support to view template download progress across all stores (#5355) 0898876 is described below commit 089887646f4cf3e0af827e12b88c4b90a3d9a34c Author: Pearl Dsilva <pearl1...@gmail.com> AuthorDate: Tue Aug 24 09:38:04 2021 +0530 ui: Support to view template download progress across all stores (#5355) * ui: Support to view template download progress across all stores * update column name --- ui/public/locales/en.json | 2 ++ ui/src/views/image/TemplateZones.vue | 26 +++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index 2645c18..0be8ae4 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -835,7 +835,9 @@ "label.download.kubeconfig.cluster": "Download kubeconfig for the cluster <br><br> The <code><b>kubectl</b></code> command-line tool uses kubeconfig files to find the information it needs to choose a cluster and communicate with the API server of a cluster.", "label.download.kubectl": "Download <code><b>kubectl</b></code> tool for cluster's Kubernetes version", "label.download.kubernetes.cluster.config": "Download Kubernetes cluster config", +"label.download.percent": "Download Percent", "label.download.progress": "Download Progress", +"label.download.state": "Download State", "label.dpd": "Dead Peer Detection", "label.drag.new.position": "Drag to new position", "label.driver": "Driver", diff --git a/ui/src/views/image/TemplateZones.vue b/ui/src/views/image/TemplateZones.vue index 8999ec7..75026e9 100644 --- a/ui/src/views/image/TemplateZones.vue +++ b/ui/src/views/image/TemplateZones.vue @@ -38,6 +38,17 @@ <span v-if="record.isready">{{ $t('label.yes') }}</span> <span v-else>{{ $t('label.no') }}</span> </div> + <template slot="expandedRowRender" slot-scope="record"> + <a-table + style="marginLeft: -50px; marginTop: 10px; marginBottom: 10px" + slot="expandedRowRender" + :columns="innerColumns" + :data-source="record.downloaddetails" + :pagination="false" + :bordered="true" + :rowKey="record => record.zoneid"> + </a-table> + </template> <template slot="action" slot-scope="text, record"> <tooltip-button style="margin-right: 5px" @@ -247,11 +258,24 @@ export default { scopedSlots: { customRender: 'isready' } } ] + this.innerColumns = [ + { + title: this.$t('label.secondary.storage'), + dataIndex: 'datastore' + }, + { + title: this.$t('label.download.percent'), + dataIndex: 'downloadPercent' + }, + { + title: this.$t('label.download.state'), + dataIndex: 'downloadState' + } + ] if (this.isActionPermitted()) { this.columns.push({ title: '', dataIndex: 'action', - fixed: 'right', width: 100, scopedSlots: { customRender: 'action' } })