You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2020/06/08 04:49:01 UTC
[cloudstack-primate] 04/04: src: misc fixes on comparing against
legacy UI
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
commit af8fa1bc5419bdbead2b66729a9325416017f2c3
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Jun 8 10:14:26 2020 +0530
src: misc fixes on comparing against legacy UI
- Display source-nat for IP address if applicable
- Use domainpath for accounts view
- Remove makeredundant for guest network (invalid for shared network for
example, most operators would rather enable it via an offering)
- Search global settings by name, than keyword
- Fix infra summary values to be under h1
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
src/components/view/InfoCard.vue | 3 +++
src/components/view/ListView.vue | 4 ++++
src/config/section/account.js | 12 ++++++------
src/config/section/network.js | 2 +-
src/views/AutogenView.vue | 2 ++
src/views/dashboard/CapacityDashboard.vue | 2 +-
src/views/infra/InfraSummary.vue | 2 +-
7 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/components/view/InfoCard.vue b/src/components/view/InfoCard.vue
index 1e9cf56..612e413 100644
--- a/src/components/view/InfoCard.vue
+++ b/src/components/view/InfoCard.vue
@@ -43,6 +43,9 @@
<a-tag v-if="resource.type">
{{ resource.type }}
</a-tag>
+ <a-tag v-if="resource.issourcenat">
+ {{ $t('label.issourcenat') }}
+ </a-tag>
<a-tag v-if="resource.broadcasturi">
{{ resource.broadcasturi }}
</a-tag>
diff --git a/src/components/view/ListView.vue b/src/components/view/ListView.vue
index ddccef8..59b679a 100644
--- a/src/components/view/ListView.vue
+++ b/src/components/view/ListView.vue
@@ -133,6 +133,10 @@
<router-link v-if="record.domainid && !record.domainid.includes(',') && $router.resolve('/domain/' + record.domainid).route.name !== '404'" :to="{ path: '/domain/' + record.domainid }">{{ text }}</router-link>
<span v-else>{{ text }}</span>
</span>
+ <span slot="domainpath" slot-scope="text, record" href="javascript:;">
+ <router-link v-if="record.domainid && !record.domainid.includes(',') && $router.resolve('/domain/' + record.domainid).route.name !== '404'" :to="{ path: '/domain/' + record.domainid }">{{ text }}</router-link>
+ <span v-else>{{ text }}</span>
+ </span>
<a slot="zone" slot-scope="text, record" href="javascript:;">
<router-link v-if="record.zoneid && !record.zoneid.includes(',') && $router.resolve('/zone/' + record.zoneid).route.name !== '404'" :to="{ path: '/zone/' + record.zoneid }">{{ text }}</router-link>
<span v-else>{{ text }}</span>
diff --git a/src/config/section/account.js b/src/config/section/account.js
index 74b3fda..c10bbab 100644
--- a/src/config/section/account.js
+++ b/src/config/section/account.js
@@ -20,8 +20,8 @@ export default {
title: 'label.accounts',
icon: 'team',
permission: ['listAccounts'],
- columns: ['name', 'state', 'rolename', 'roletype', 'domain'],
- details: ['name', 'id', 'rolename', 'roletype', 'domain', 'networkdomain', 'iptotal', 'vmtotal', 'volumetotal', 'receivedbytes', 'sentbytes', 'vmlimit', 'iplimit', 'volumelimit', 'snapshotlimit', 'templatelimit', 'vpclimit', 'cpulimit', 'memorylimit', 'networklimit', 'primarystoragelimit', 'secondarystoragelimit'],
+ columns: ['name', 'state', 'rolename', 'roletype', 'domainpath'],
+ details: ['name', 'id', 'rolename', 'roletype', 'domainpath', 'networkdomain', 'iptotal', 'vmtotal', 'volumetotal', 'receivedbytes', 'sentbytes', 'vmlimit', 'iplimit', 'volumelimit', 'snapshotlimit', 'templatelimit', 'vpclimit', 'cpulimit', 'memorylimit', 'networklimit', 'primarystoragelimit', 'secondarystoragelimit'],
related: [{
name: 'accountuser',
title: 'label.users',
@@ -33,15 +33,15 @@ export default {
component: () => import('@/components/view/DetailsTab.vue')
},
{
- name: 'certificate',
- component: () => import('@/views/iam/SSLCertificateTab.vue')
- },
- {
name: 'limits',
show: (record, route, user) => { return ['Admin'].includes(user.roletype) },
component: () => import('@/components/view/ResourceLimitTab.vue')
},
{
+ name: 'certificate',
+ component: () => import('@/views/iam/SSLCertificateTab.vue')
+ },
+ {
name: 'settings',
component: () => import('@/components/view/SettingsTab.vue'),
show: (record, route, user) => { return ['Admin'].includes(user.roletype) }
diff --git a/src/config/section/network.js b/src/config/section/network.js
index 900de70..fe02c68 100644
--- a/src/config/section/network.js
+++ b/src/config/section/network.js
@@ -72,7 +72,7 @@ export default {
icon: 'sync',
label: 'label.restart.network',
dataView: true,
- args: ['makeredundant', 'cleanup']
+ args: ['cleanup']
},
{
api: 'replaceNetworkACLList',
diff --git a/src/views/AutogenView.vue b/src/views/AutogenView.vue
index 14d7a3a..76b715b 100644
--- a/src/views/AutogenView.vue
+++ b/src/views/AutogenView.vue
@@ -459,6 +459,8 @@ export default {
params.name = this.searchQuery
} else if (this.apiName === 'quotaEmailTemplateList') {
params.templatetype = this.searchQuery
+ } else if (this.apiName === 'listConfigurations') {
+ params.name = this.searchQuery
} else {
params.keyword = this.searchQuery
}
diff --git a/src/views/dashboard/CapacityDashboard.vue b/src/views/dashboard/CapacityDashboard.vue
index 6ec2669..f717e3d 100644
--- a/src/views/dashboard/CapacityDashboard.vue
+++ b/src/views/dashboard/CapacityDashboard.vue
@@ -54,7 +54,7 @@
:key="stat.type">
<chart-card :loading="loading">
<div class="capacity-dashboard-chart-card-inner">
- <h4>{{ $t(ts[stat.name]) }}</h4>
+ <h3>{{ $t(ts[stat.name]) }}</h3>
<a-progress
type="dashboard"
:status="getStatus(parseFloat(stat.percentused))"
diff --git a/src/views/infra/InfraSummary.vue b/src/views/infra/InfraSummary.vue
index 7834ea2..1578a47 100644
--- a/src/views/infra/InfraSummary.vue
+++ b/src/views/infra/InfraSummary.vue
@@ -149,7 +149,7 @@
<div class="chart-card-inner">
<router-link :to="{ name: section.substring(0, section.length - 1) }">
<h2>{{ $t(routes[section].title) }}</h2>
- <h1><a-icon :type="routes[section].icon" /> {{ stats[section] }}</h1>
+ <h2><a-icon :type="routes[section].icon" /> {{ stats[section] }}</h2>
</router-link>
</div>
</chart-card>