From b275c297094e7d28b2c3721ed828ac00117657c4 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <hoangnm@unitech.vn>
Date: Wed, 9 Feb 2022 15:43:31 +0700
Subject: [PATCH] UI - Add Network: shows "Offering for Isolated networks with
 no Source Nat service" on Network Offering for normal users (#5904)

* shows "Offering for Isolated networks with no Source Nat service" for normal users

* fixes roles

* fix selected tabs
---
 ui/src/views/network/CreateIsolatedNetworkForm.vue | 1 -
 ui/src/views/network/CreateNetwork.vue             | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ui/src/views/network/CreateIsolatedNetworkForm.vue b/ui/src/views/network/CreateIsolatedNetworkForm.vue
index 1f717710b85..761d8128dad 100644
--- a/ui/src/views/network/CreateIsolatedNetworkForm.vue
+++ b/ui/src/views/network/CreateIsolatedNetworkForm.vue
@@ -344,7 +344,6 @@ export default {
       var params = {
         zoneid: this.selectedZone.id,
         guestiptype: 'Isolated',
-        supportedServices: 'SourceNat',
         state: 'Enabled'
       }
       if (isAdminOrDomainAdmin() && this.selectedDomain.id !== '-1') { // domain is visible only for admins
diff --git a/ui/src/views/network/CreateNetwork.vue b/ui/src/views/network/CreateNetwork.vue
index 56c144932cf..ababc337394 100644
--- a/ui/src/views/network/CreateNetwork.vue
+++ b/ui/src/views/network/CreateNetwork.vue
@@ -17,7 +17,7 @@
 
 <template>
   <a-spin :spinning="loading" class="form-layout">
-    <a-tabs defaultActiveKey="1" :animated="false" v-if="!loading">
+    <a-tabs :default-active-key="defaultNetworkTypeTabKey" :animated="false" v-if="!loading">
       <a-tab-pane :tab="$t('label.isolated')" key="1" v-if="isAdvancedZoneWithoutSGAvailable">
         <CreateIsolatedNetworkForm
           :loading="loading"
@@ -68,7 +68,7 @@ export default {
   },
   data () {
     return {
-      isAdvancedZoneWithoutSGAvailable: true,
+      isAdvancedZoneWithoutSGAvailable: false,
       defaultNetworkTypeTabKey: '1',
       loading: false,
       actionZones: [],
@@ -79,14 +79,17 @@ export default {
     const promises = []
     promises.push(this.fetchActionZoneData())
     Promise.all(promises).then(() => {
+      this.isAdvancedZoneWithoutSGAvailable = false
+      this.defaultNetworkTypeTabKey = '2'
+
       for (const i in this.actionZones) {
         const zone = this.actionZones[i]
         if (zone.networktype === 'Advanced' && zone.securitygroupsenabled !== true) {
           this.isAdvancedZoneWithoutSGAvailable = true
+          this.defaultNetworkTypeTabKey = '1'
           return
         }
       }
-      this.isAdvancedZoneWithoutSGAvailable = false
     })
   },
   methods: {