diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue index 85e8bc21af7..6d0356b7148 100644 --- a/ui/src/components/view/InfoCard.vue +++ b/ui/src/components/view/InfoCard.vue @@ -21,7 +21,10 @@
-
+
@@ -32,9 +35,8 @@
{{ $t(resource.name.toLowerCase()) }}

- {{ resource.displayname || resource.displaytext || resource.name || resource.username || resource.ipaddress || resource.virtualmachinename || resource.templatetype }} + {{ name }}

-
@@ -70,6 +72,12 @@ {{ resource.version }} + + + +
@@ -296,9 +304,11 @@
{{ $t('label.ip') }}
- - {{ resource.nic.filter(e => { return e.ipaddress }).map(e => { return e.ipaddress }).join(', ') }} - {{ resource.ipaddress }} + + {{ ipaddress }}
@@ -702,6 +712,8 @@ export default { }, data () { return { + name: '', + ipaddress: '', resourceType: '', annotationType: '', inputVisible: false, @@ -722,6 +734,7 @@ export default { this.resourceType = this.$route.meta.resourceType this.annotationType = '' this.showKeys = false + this.setData() switch (this.resourceType) { case 'UserVm': @@ -752,7 +765,19 @@ export default { } } }, + created () { + this.setData() + }, methods: { + setData () { + this.name = this.resource.displayname || this.resource.displaytext || this.resource.name || this.resource.username || + this.resource.ipaddress || this.resource.virtualmachinename || this.resource.templatetype + if (this.resource.nic && this.resource.nic.length > 0) { + this.ipaddress = this.resource.nic.filter(e => { return e.ipaddress }).map(e => { return e.ipaddress }).join(', ') + } else { + this.ipaddress = this.resource.ipaddress + } + }, toSize (kb) { if (!kb) { return '0 KB' @@ -905,6 +930,7 @@ export default { margin-right: 20px; overflow: hidden; min-width: 50px; + cursor: pointer; img { height: 100%;