From baf24c2af08c8dab159e0446796db41418c5b25f Mon Sep 17 00:00:00 2001
From: utchoang <hoangnm@unitech.vn>
Date: Thu, 27 Jan 2022 07:56:30 +0700
Subject: [PATCH 1/4] shows "Offering for Isolated networks with no Source Nat
 service" for normal users

---
 ui/src/views/network/CreateIsolatedNetworkForm.vue |  8 +++++---
 ui/src/views/network/CreateNetwork.vue             | 11 +++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ui/src/views/network/CreateIsolatedNetworkForm.vue b/ui/src/views/network/CreateIsolatedNetworkForm.vue
index 1f717710b85c..8409a4942bbe 100644
--- a/ui/src/views/network/CreateIsolatedNetworkForm.vue
+++ b/ui/src/views/network/CreateIsolatedNetworkForm.vue
@@ -344,11 +344,13 @@ 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
-        params.domainid = this.selectedDomain.id
+      if (isAdminOrDomainAdmin()) {
+        params.supportedServices = 'SourceNat'
+        if (this.selectedDomain.id !== '-1') { // domain is visible only for admins
+          params.domainid = this.selectedDomain.id
+        }
       }
       if (!isAdmin()) { // normal user is not aware of the VLANs in the system, so normal user is not allowed to create network with network offerings whose specifyvlan = true
         params.specifyvlan = false
diff --git a/ui/src/views/network/CreateNetwork.vue b/ui/src/views/network/CreateNetwork.vue
index 56c144932cf3..b85d88843904 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 :activeKey="defaultNetworkTypeTabKey" :animated="false" v-if="!loading">
       <a-tab-pane :tab="$t('label.isolated')" key="1" v-if="isAdvancedZoneWithoutSGAvailable">
         <CreateIsolatedNetworkForm
           :loading="loading"
@@ -68,8 +68,8 @@ export default {
   },
   data () {
     return {
-      isAdvancedZoneWithoutSGAvailable: true,
-      defaultNetworkTypeTabKey: '1',
+      isAdvancedZoneWithoutSGAvailable: false,
+      defaultNetworkTypeTabKey: '2',
       loading: false,
       actionZones: [],
       actionZoneLoading: false
@@ -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: {

From 4de26181e83037c2da35bdc4cbe63280ba77b762 Mon Sep 17 00:00:00 2001
From: utchoang <hoangnm@unitech.vn>
Date: Tue, 8 Feb 2022 11:21:26 +0700
Subject: [PATCH 2/4] fixes

---
 ui/src/views/network/CreateIsolatedNetworkForm.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ui/src/views/network/CreateIsolatedNetworkForm.vue b/ui/src/views/network/CreateIsolatedNetworkForm.vue
index 8409a4942bbe..661cd681ab63 100644
--- a/ui/src/views/network/CreateIsolatedNetworkForm.vue
+++ b/ui/src/views/network/CreateIsolatedNetworkForm.vue
@@ -346,11 +346,8 @@ export default {
         guestiptype: 'Isolated',
         state: 'Enabled'
       }
-      if (isAdminOrDomainAdmin()) {
-        params.supportedServices = 'SourceNat'
-        if (this.selectedDomain.id !== '-1') { // domain is visible only for admins
-          params.domainid = this.selectedDomain.id
-        }
+      if (this.selectedDomain.id !== '-1') { // domain is visible only for admins
+        params.domainid = this.selectedDomain.id
       }
       if (!isAdmin()) { // normal user is not aware of the VLANs in the system, so normal user is not allowed to create network with network offerings whose specifyvlan = true
         params.specifyvlan = false

From 4b0653e30f9f1ecaba3974f005922e225eb69d2e Mon Sep 17 00:00:00 2001
From: utchoang <hoangnm@unitech.vn>
Date: Tue, 8 Feb 2022 11:22:45 +0700
Subject: [PATCH 3/4] fixes roles

---
 ui/src/views/network/CreateIsolatedNetworkForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/views/network/CreateIsolatedNetworkForm.vue b/ui/src/views/network/CreateIsolatedNetworkForm.vue
index 661cd681ab63..761d8128dada 100644
--- a/ui/src/views/network/CreateIsolatedNetworkForm.vue
+++ b/ui/src/views/network/CreateIsolatedNetworkForm.vue
@@ -346,7 +346,7 @@ export default {
         guestiptype: 'Isolated',
         state: 'Enabled'
       }
-      if (this.selectedDomain.id !== '-1') { // domain is visible only for admins
+      if (isAdminOrDomainAdmin() && this.selectedDomain.id !== '-1') { // domain is visible only for admins
         params.domainid = this.selectedDomain.id
       }
       if (!isAdmin()) { // normal user is not aware of the VLANs in the system, so normal user is not allowed to create network with network offerings whose specifyvlan = true

From 7bc9c013f0135d7bbacd358c430d74bf12a0c560 Mon Sep 17 00:00:00 2001
From: utchoang <hoangnm@unitech.vn>
Date: Wed, 9 Feb 2022 07:45:27 +0700
Subject: [PATCH 4/4] fix selected tabs

---
 ui/src/views/network/CreateNetwork.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/views/network/CreateNetwork.vue b/ui/src/views/network/CreateNetwork.vue
index b85d88843904..ababc3373946 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 :activeKey="defaultNetworkTypeTabKey" :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"
@@ -69,7 +69,7 @@ export default {
   data () {
     return {
       isAdvancedZoneWithoutSGAvailable: false,
-      defaultNetworkTypeTabKey: '2',
+      defaultNetworkTypeTabKey: '1',
       loading: false,
       actionZones: [],
       actionZoneLoading: false