src: misc fixes on comparing against legacy UI

yadvr · yadvr · commit bede382af4e1 · 2021-01-20T07:06:18.000+05:30
- 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 &lt;rohit.yadav@shapeblue.com&gt;
diff --git a/ui/src/components/view/InfoCard.vue b/ui/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/ui/src/components/view/ListView.vue b/ui/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/ui/src/config/section/account.js b/ui/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',
@@ -32,15 +32,15 @@ export default {
       name: 'details',
       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'),
diff --git a/ui/src/config/section/network.js b/ui/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/ui/src/views/AutogenView.vue b/ui/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/ui/src/views/dashboard/CapacityDashboard.vue b/ui/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/ui/src/views/infra/InfraSummary.vue b/ui/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>

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ export default {`
`72`	`72`	`icon: 'sync',`
`73`	`73`	`label: 'label.restart.network',`
`74`	`74`	`dataView: true,`
`75`		`- args: ['makeredundant', 'cleanup']`
	`75`	`+ args: ['cleanup']`
`76`	`76`	`},`
`77`	`77`	`{`
`78`	`78`	`api: 'replaceNetworkACLList',`
Original file line number	Diff line number	Diff line change
`@@ -459,6 +459,8 @@ export default {`
`459`	`459`	`params.name = this.searchQuery`
`460`	`460`	`} else if (this.apiName === 'quotaEmailTemplateList') {`
`461`	`461`	`params.templatetype = this.searchQuery`
	`462`	`+ } else if (this.apiName === 'listConfigurations') {`
	`463`	`+ params.name = this.searchQuery`
`462`	`464`	`} else {`
`463`	`465`	`params.keyword = this.searchQuery`
`464`	`466`	`}`