From 5ee41a51c9541b74148a1466643a710d39f2ffcc Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Mon, 21 Dec 2020 16:47:29 +0530
Subject: [PATCH] createnetwork: Show tabs only when supported networks are
 determined (#901)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 ui/src/views/network/CreateNetwork.vue | 40 +++++++++++++-------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/ui/src/views/network/CreateNetwork.vue b/ui/src/views/network/CreateNetwork.vue
index ed296ffd767..0c62041ec34 100644
--- a/ui/src/views/network/CreateNetwork.vue
+++ b/ui/src/views/network/CreateNetwork.vue
@@ -16,9 +16,9 @@
 // under the License.
 
 <template>
-  <div class="form-layout">
-    <a-tabs defaultActiveKey="1" :animated="false">
-      <a-tab-pane :tab="$t('label.isolated')" key="1" v-if="this.isAdvancedZoneWithoutSGAvailable()">
+  <a-spin :spinning="loading" class="form-layout">
+    <a-tabs defaultActiveKey="1" :animated="false" v-if="!loading">
+      <a-tab-pane :tab="$t('label.isolated')" key="1" v-if="isAdvancedZoneWithoutSGAvailable">
         <CreateIsolatedNetworkForm
           :loading="loading"
           :resource="resource"
@@ -43,7 +43,7 @@
           @refresh="handleRefresh"/>
       </a-tab-pane>
     </a-tabs>
-  </div>
+  </a-spin>
 </template>
 
 <script>
@@ -67,6 +67,7 @@ export default {
   },
   data () {
     return {
+      isAdvancedZoneWithoutSGAvailable: true,
       defaultNetworkTypeTabKey: '1',
       loading: false,
       actionZones: [],
@@ -78,40 +79,39 @@ export default {
       this.fetchData()
     }
   },
-  mounted () {
-    this.fetchData()
+  created () {
+    const promises = []
+    promises.push(this.fetchActionZoneData())
+    Promise.all(promises).then(() => {
+      for (const i in this.actionZones) {
+        const zone = this.actionZones[i]
+        if (zone.networktype === 'Advanced' && zone.securitygroupsenabled !== true) {
+          this.isAdvancedZoneWithoutSGAvailable = true
+          return
+        }
+      }
+      this.isAdvancedZoneWithoutSGAvailable = false
+    })
   },
   methods: {
-    fetchData () {
-      this.loading = true
-      this.fetchActionZoneData()
-    },
     isAdmin () {
       return ['Admin'].includes(this.$store.getters.userInfo.roletype)
     },
     fetchActionZoneData () {
+      this.loading = true
       const params = {}
       if (this.resource && this.resource.zoneid) {
         params.id = this.resource.zoneid
       }
       params.listAll = true
       this.actionZonesLoading = true
-      api('listZones', params).then(json => {
+      return api('listZones', params).then(json => {
         this.actionZones = json.listzonesresponse.zone
       }).finally(() => {
         this.actionZoneLoading = false
         this.loading = false
       })
     },
-    isAdvancedZoneWithoutSGAvailable () {
-      for (const i in this.actionZones) {
-        const zone = this.actionZones[i]
-        if (zone.networktype === 'Advanced' && zone.securitygroupsenabled !== true) {
-          return true
-        }
-      }
-      return false
-    },
     handleRefresh () {
       this.fetchData()
     },