From d105d6a770f9b105bb9994c3e0782a4c07354337 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <hoangnm@unitech.vn>
Date: Thu, 18 Mar 2021 14:43:18 +0700
Subject: [PATCH] ui: Show display text instead of name (#4831)

---
 ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue | 2 +-
 ui/src/views/network/CreateIsolatedNetworkForm.vue    | 2 +-
 ui/src/views/network/CreateL2NetworkForm.vue          | 2 +-
 ui/src/views/network/CreateNetwork.vue                | 6 ------
 ui/src/views/network/CreateSharedNetworkForm.vue      | 2 +-
 ui/src/views/network/VpcTiersTab.vue                  | 2 +-
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue b/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
index e44d3347a36..9650fd404d5 100644
--- a/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
+++ b/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
@@ -237,7 +237,7 @@
           <a-select-option
             v-for="networkOffering in availableNetworkOfferings"
             :key="networkOffering.id">
-            {{ networkOffering.name }}
+            {{ networkOffering.displaytext || networkOffering.name || networkOffering.description }}
           </a-select-option>
         </a-select>
       </a-form-item>
diff --git a/ui/src/views/network/CreateIsolatedNetworkForm.vue b/ui/src/views/network/CreateIsolatedNetworkForm.vue
index b40c241b5c1..136e1a59867 100644
--- a/ui/src/views/network/CreateIsolatedNetworkForm.vue
+++ b/ui/src/views/network/CreateIsolatedNetworkForm.vue
@@ -125,7 +125,7 @@
               :placeholder="this.$t('label.networkofferingid')"
               @change="val => { this.handleNetworkOfferingChange(this.networkOfferings[val]) }">
               <a-select-option v-for="(opt, optIndex) in this.networkOfferings" :key="optIndex">
-                {{ opt.name || opt.description }}
+                {{ opt.displaytext || opt.name || opt.description }}
               </a-select-option>
             </a-select>
           </a-form-item>
diff --git a/ui/src/views/network/CreateL2NetworkForm.vue b/ui/src/views/network/CreateL2NetworkForm.vue
index b21bce0b1f8..9d48a80186f 100644
--- a/ui/src/views/network/CreateL2NetworkForm.vue
+++ b/ui/src/views/network/CreateL2NetworkForm.vue
@@ -125,7 +125,7 @@
               :placeholder="this.$t('label.networkofferingid')"
               @change="val => { this.handleNetworkOfferingChange(this.networkOfferings[val]) }">
               <a-select-option v-for="(opt, optIndex) in this.networkOfferings" :key="optIndex">
-                {{ opt.name || opt.description }}
+                {{ opt.displaytext || opt.name || opt.description }}
               </a-select-option>
             </a-select>
           </a-form-item>
diff --git a/ui/src/views/network/CreateNetwork.vue b/ui/src/views/network/CreateNetwork.vue
index 0c62041ec34..29a1c151379 100644
--- a/ui/src/views/network/CreateNetwork.vue
+++ b/ui/src/views/network/CreateNetwork.vue
@@ -74,11 +74,6 @@ export default {
       actionZoneLoading: false
     }
   },
-  watch: {
-    resource (newItem, oldItem) {
-      this.fetchData()
-    }
-  },
   created () {
     const promises = []
     promises.push(this.fetchActionZoneData())
@@ -113,7 +108,6 @@ export default {
       })
     },
     handleRefresh () {
-      this.fetchData()
     },
     refreshParent () {
       this.$emit('refresh-data')
diff --git a/ui/src/views/network/CreateSharedNetworkForm.vue b/ui/src/views/network/CreateSharedNetworkForm.vue
index e91a5631c4a..9b020c18c5c 100644
--- a/ui/src/views/network/CreateSharedNetworkForm.vue
+++ b/ui/src/views/network/CreateSharedNetworkForm.vue
@@ -284,7 +284,7 @@
               :placeholder="this.$t('label.networkofferingid')"
               @change="val => { this.handleNetworkOfferingChange(this.networkOfferings[val]) }">
               <a-select-option v-for="(opt, optIndex) in this.networkOfferings" :key="optIndex">
-                {{ opt.name || opt.description }}
+                {{ opt.displaytext || opt.name || opt.description }}
               </a-select-option>
             </a-select>
           </a-form-item>
diff --git a/ui/src/views/network/VpcTiersTab.vue b/ui/src/views/network/VpcTiersTab.vue
index ae67a8f87a2..08a4533d2bb 100644
--- a/ui/src/views/network/VpcTiersTab.vue
+++ b/ui/src/views/network/VpcTiersTab.vue
@@ -170,7 +170,7 @@
             <a-select
               v-decorator="['networkOffering',{rules: [{ required: true, message: `${$t('label.required')}` }]}]">
               <a-select-option v-for="item in networkOfferings" :key="item.id" :value="item.id">
-                {{ item.name }}
+                {{ item.displaytext || item.name || item.description }}
               </a-select-option>
             </a-select>
           </a-form-item>