From ca4e9b455b5f7603e246dc9026a32a7f4788302a Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Mon, 23 Mar 2020 21:52:25 +0530
Subject: [PATCH] fixes

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 ui/src/components/CheckBoxSelectPair.vue     |  3 +--
 ui/src/components/view/DetailsTab.vue        |  9 ++++++--
 ui/src/components/view/ListView.vue          | 19 ++++++++++------
 ui/src/config/section/offering.js            |  4 ++--
 ui/src/locales/en.json                       |  2 +-
 ui/src/views/infra/InfraSummary.vue          |  3 ---
 ui/src/views/offering/AddComputeOffering.vue | 24 +++++++++-----------
 ui/src/views/offering/AddDiskOffering.vue    |  1 -
 ui/src/views/offering/AddNetworkOffering.vue |  4 +---
 ui/src/views/storage/CreateVolume.vue        |  3 ---
 10 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/ui/src/components/CheckBoxSelectPair.vue b/ui/src/components/CheckBoxSelectPair.vue
index c385b03aaca..5c95252d83b 100644
--- a/ui/src/components/CheckBoxSelectPair.vue
+++ b/ui/src/components/CheckBoxSelectPair.vue
@@ -105,12 +105,11 @@ export default {
 
 <style scoped lang="scss">
   .pair-checkbox {
-    width: 18vw;
+    width: 180px;
   }
   .pair-select-container {
     position: relative;
     float: right;
-    margin-left: 5vw;
     margin-bottom: -5px;
     width: 20vw;
   }
diff --git a/ui/src/components/view/DetailsTab.vue b/ui/src/components/view/DetailsTab.vue
index 641b671d454..10573111e67 100644
--- a/ui/src/components/view/DetailsTab.vue
+++ b/ui/src/components/view/DetailsTab.vue
@@ -21,9 +21,14 @@
     :dataSource="$route.meta.details">
     <a-list-item slot="renderItem" slot-scope="item" v-if="item in resource">
       <div>
-        <strong>{{ $t(item) }}</strong>
+        <strong>{{ item === 'service' ? $t('supportedservices') : $t(item) }}</strong>
         <br/>
-        <div>
+        <div v-if="Array.isArray(resource[item]) && item === 'service'">
+          <div v-for="(item, idx) in resource[item]" :key="idx">
+            {{ item.name }} : {{ item.provider[0].name }}
+          </div>
+        </div>
+        <div v-else>
           {{ resource[item] }}
         </div>
       </div>
diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index f60ccd0007a..b43b7664e15 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -114,13 +114,6 @@
     <a slot="vpcname" slot-scope="text, record" href="javascript:;">
       <router-link :to="{ path: '/vpc/' + record.vpcid }">{{ text }}</router-link>
     </a>
-    <a slot="account" slot-scope="text, record" href="javascript:;">
-      <router-link :to="{ path: '/account/' + record.accountid }" v-if="record.accountid">{{ text }}</router-link>
-      <router-link :to="{ path: '/account', query: { name: record.account, domainid: record.domainid } }" v-else>{{ text }}</router-link>
-    </a>
-    <a slot="domain" slot-scope="text, record" href="javascript:;">
-      <router-link :to="{ path: '/domain/' + record.domainid }">{{ text }}</router-link>
-    </a>
     <a slot="hostname" slot-scope="text, record" href="javascript:;">
       <router-link v-if="record.hostid" :to="{ path: '/host/' + record.hostid }">{{ text }}</router-link>
       <router-link v-else-if="record.hostname" :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
@@ -132,6 +125,18 @@
     <a slot="podname" slot-scope="text, record" href="javascript:;">
       <router-link :to="{ path: '/pod/' + record.podid }">{{ text }}</router-link>
     </a>
+    <a slot="account" slot-scope="text, record" href="javascript:;">
+      <router-link :to="{ path: '/account/' + record.accountid }" v-if="record.accountid">{{ text }}</router-link>
+      <router-link :to="{ path: '/account', query: { name: record.account, domainid: record.domainid } }" v-else>{{ text }}</router-link>
+    </a>
+    <span slot="domain" slot-scope="text, record" href="javascript:;">
+      <router-link v-if="record.domainid && !record.domainid.includes(',')" :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(',')" :to="{ path: '/zone/' + record.zoneid }">{{ text }}</router-link>
+      <span v-else>{{ text }}</span>
+    </a>
     <a slot="zonename" slot-scope="text, record" href="javascript:;">
       <router-link :to="{ path: '/zone/' + record.zoneid }">{{ text }}</router-link>
     </a>
diff --git a/ui/src/config/section/offering.js b/ui/src/config/section/offering.js
index c25659ab117..09e3780d29f 100644
--- a/ui/src/config/section/offering.js
+++ b/ui/src/config/section/offering.js
@@ -139,7 +139,7 @@ export default {
       permission: ['listNetworkOfferings'],
       params: { isrecursive: 'true' },
       columns: ['name', 'state', 'guestiptype', 'traffictype', 'networkrate', 'tags', 'domain', 'zone', 'order'],
-      details: ['name', 'id', 'displaytext', 'guestiptype', 'traffictype', 'networkrate', 'ispersistent', 'egressdefaultpolicy', 'availability', 'conservemode', 'specifyvlan', 'specifyipranges', 'supportspublicaccess', 'supportsstrechedl2subnet', 'service', 'tags', 'domain', 'zone'],
+      details: ['name', 'id', 'displaytext', 'guestiptype', 'traffictype', 'networkrate', 'ispersistent', 'egressdefaultpolicy', 'availability', 'conservemode', 'specifyvlan', 'specifyipranges', 'supportspublicaccess', 'supportsstrechedl2subnet', 'tags', 'service', 'domain', 'zone'],
       actions: [{
         api: 'createNetworkOffering',
         icon: 'plus',
@@ -204,7 +204,7 @@ export default {
       params: { isrecursive: 'true' },
       resourceType: 'VpcOffering',
       columns: ['name', 'state', 'displaytext', 'domain', 'zone', 'order'],
-      details: ['name', 'id', 'displaytext', 'distributedvpcrouter', 'service', 'tags', 'domain', 'zone', 'created'],
+      details: ['name', 'id', 'displaytext', 'distributedvpcrouter', 'tags', 'service', 'domain', 'zone', 'created'],
       related: [{
         name: 'vpc',
         title: 'VPCs',
diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json
index 5e05862bdd2..c4c3751d96f 100644
--- a/ui/src/locales/en.json
+++ b/ui/src/locales/en.json
@@ -103,7 +103,7 @@
 "broadcasturi": "Broadcast URI",
 "bucket": "Bucket",
 "bypassVlanOverlapCheck": "Bypass VLAN id/range overlap",
-"cacheMode": "Write-cache Type",
+"cachemode": "Write-cache Type",
 "capacity": "Capacity",
 "capacityBytes": "Capacity Bytes",
 "capacityIops": "Capacity IOPS",
diff --git a/ui/src/views/infra/InfraSummary.vue b/ui/src/views/infra/InfraSummary.vue
index d406b325a67..01e620dc59d 100644
--- a/ui/src/views/infra/InfraSummary.vue
+++ b/ui/src/views/infra/InfraSummary.vue
@@ -231,9 +231,6 @@ export default {
       api('queryAsyncJobResult', { jobid: jobId }).then(json => {
         const result = json.queryasyncjobresultresponse
         if (result.jobstatus === 1 && this.maxCerts === count) {
-          console.log(result)
-          console.log(this.maxCerts)
-          console.log(count)
           this.$message.success('Certificate Uploaded: ' + result.jobresult.customcertificate.message)
           this.$notification.success({
             message: 'Certificate Uploaded',
diff --git a/ui/src/views/offering/AddComputeOffering.vue b/ui/src/views/offering/AddComputeOffering.vue
index 197bb3dcee7..a77bfac170e 100644
--- a/ui/src/views/offering/AddComputeOffering.vue
+++ b/ui/src/views/offering/AddComputeOffering.vue
@@ -85,7 +85,7 @@
             </a-radio-button>
           </a-radio-group>
         </a-form-item>
-        <a-form-item :label="$t('cacheMode')">
+        <a-form-item :label="$t('cachemode')">
           <a-radio-group
             v-decorator="['cachemode', {
               initialValue: this.cacheMode
@@ -386,10 +386,10 @@
               return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
             }"
             :loading="storageTagLoading"
-            :placeholder="this.$t('tags')"
+            :placeholder="$t('storagetags')"
             v-if="this.isAdmin()">
-            <a-select-option v-for="(opt) in this.storageTags" :key="opt.name">
-              {{ opt.name || opt.description }}
+            <a-select-option v-for="opt in storageTags" :key="opt">
+              {{ opt }}
             </a-select-option>
           </a-select>
         </a-form-item>
@@ -538,7 +538,7 @@ export default {
       isSystem: false,
       storageType: 'shared',
       provisioningType: 'thin',
-      cacheMode: 'node',
+      cacheMode: 'none',
       offeringType: 'fixed',
       qosType: '',
       isCustomizedDiskIops: false,
@@ -638,14 +638,12 @@ export default {
       const params = {}
       params.listAll = true
       this.storageTagLoading = true
+      this.storageTags = []
       api('listStorageTags', params).then(json => {
-        const tags = json.liststoragetagsresponse.storagetag
-        if (this.arrayHasItems(tags)) {
-          for (var i in tags) {
-            var tag = {}
-            tag.id = tags[i].name
-            tag.name = tags[i].name
-            this.storageTags.push(tag)
+        const tags = json.liststoragetagsresponse.storagetag || []
+        for (const tag of tags) {
+          if (!this.storageTags.includes(tag.name)) {
+            this.storageTags.push(tag.name)
           }
         }
       }).finally(() => {
@@ -857,7 +855,7 @@ export default {
   .form-layout {
     width: 80vw;
     @media (min-width: 800px) {
-      width: 400px;
+      width: 500px;
     }
   }
 
diff --git a/ui/src/views/offering/AddDiskOffering.vue b/ui/src/views/offering/AddDiskOffering.vue
index f5e0665c355..d85077334f7 100644
--- a/ui/src/views/offering/AddDiskOffering.vue
+++ b/ui/src/views/offering/AddDiskOffering.vue
@@ -421,7 +421,6 @@ export default {
         if (err) {
           return
         }
-        console.log(values)
         var params = {
           isMirrored: false,
           name: values.name,
diff --git a/ui/src/views/offering/AddNetworkOffering.vue b/ui/src/views/offering/AddNetworkOffering.vue
index 7cd988f6040..c3bd478c50b 100644
--- a/ui/src/views/offering/AddNetworkOffering.vue
+++ b/ui/src/views/offering/AddNetworkOffering.vue
@@ -417,7 +417,7 @@ export default {
     this.zones = [
       {
         id: null,
-        name: this.$t('all.zone')
+        name: this.$t('label.all.zone')
       }
     ]
   },
@@ -593,7 +593,6 @@ export default {
           self.supportedServices[index] = svc
         }
       })
-      console.log(this.supportedServices)
     },
     handleSupportedServiceChange (service, checked, provider) {
       if (service === 'SourceNat') {
@@ -652,7 +651,6 @@ export default {
         if (err) {
           return
         }
-        console.log(values)
         var params = {}
 
         var self = this
diff --git a/ui/src/views/storage/CreateVolume.vue b/ui/src/views/storage/CreateVolume.vue
index 5a5e0735d65..07b4c04c5f8 100644
--- a/ui/src/views/storage/CreateVolume.vue
+++ b/ui/src/views/storage/CreateVolume.vue
@@ -94,9 +94,6 @@ export default {
     this.fetchData()
   },
   methods: {
-    log (o) {
-      console.log(o)
-    },
     fetchData () {
       this.loading = true
       api('listZones').then(json => {