Fixing ip tabs

Author: davidjumani

src/components/view/ResourceView.vue

@@ -113,27 +113,8 @@ export default {
       this.activeTab = key
     },
     showTab (tab) {
-      if ('networkServiceFilter' in tab) {
-        if (this.resource && this.resource.virtualmachineid && !this.resource.vpcid && tab.name !== 'firewall') {
-          return false
-        }
-        if (this.resource && this.resource.virtualmachineid && this.resource.vpcid) {
-          return false
-        }
-        // dont display any option for source NAT IP of VPC
-        if (this.resource && this.resource.vpcid && !this.resource.issourcenat && tab.name !== 'firewall') {
-          return true
-        }
-        // display LB and PF options for isolated networks if static nat is disabled
-        if (this.resource && !this.resource.vpcid) {
-          if (!this.resource.isstaticnat) {
-            return true
-          } else if (tab.name === 'firewall') {
-            return true
-          }
-        }
-        return this.networkService && this.networkService.service &&
-          tab.networkServiceFilter(this.networkService.service)
+      if (this.networkService && this.networkService.service && tab.networkServiceFilter) {
+        return tab.networkServiceFilter(this.networkService.service)
       } else if ('show' in tab) {
         return tab.show(this.resource, this.$route, this.$store.getters.userInfo)
       } else {

src/views/network/PublicIpResource.vue

@@ -63,6 +63,10 @@ export default {
       tabs: [{
         name: 'details',
         component: () => import('@/components/view/DetailsTab.vue')
+      }],
+      defaultTabs: [{
+        name: 'details',
+        component: () => import('@/components/view/DetailsTab.vue')
       }]
     }
   },
@@ -97,39 +101,68 @@ export default {
       }
 
       this.loading = true
-      this.portFWRuleCount = await this.fetchPortFWRule()
+      await this.filterTabs()
+      await this.fetchAction()
+      this.loading = false
+    },
+    async filterTabs () {
+      // VPC IPs with source nat have only VPN
+      if (this.resource && this.resource.vpcid && this.resource.issourcenat) {
+        this.tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'vpn'))
+        return
+      }
+
+      // VPC IPs with vpnenabled have only VPN
+      if (this.resource && this.resource.vpcid && this.resource.vpnenabled) {
+        this.tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'vpn'))
+        return
+      }
+
+      // VPC IPs with static nat have nothing
+      if (this.resource && this.resource.vpcid && this.resource.isstaticnat) {
+        return
+      }
+
+      if (this.resource && this.resource.vpcid) {
+        // VPC IPs don't have firewall
+        let tabs = this.$route.meta.tabs.filter(tab => tab.name !== 'firewall')
 
-      // disable load balancing rules only if port forwarding is enabled and
-      // network belongs to VPC
-      if (this.portFWRuleCount > 0 && this.resource.vpcid) {
-        this.tabs = this.$route.meta.tabs.filter(tab => tab.name !== 'loadbalancing')
-      } else {
+        this.portFWRuleCount = await this.fetchPortFWRule()
         this.loadBalancerRuleCount = await this.fetchLoadBalancerRule()
 
-        // for isolated networks, display both LB and PF
-        // for VPC they are mutually exclusive
+        // VPC IPs with PF only have PF
+        if (this.portFWRuleCount > 0) {
+          tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'portforwarding'))
+        }
+
+        // VPC IPs with LB rules only have LB
         if (this.loadBalancerRuleCount > 0) {
-          this.tabs =
-            this.resource.vpcid ? this.$route.meta.tabs.filter(tab => tab.name !== 'portforwarding') : this.$route.meta.tabs
-          this.loading = false
-        } else {
-          this.tabs = this.$route.meta.tabs
+          tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'loadbalancing'))
         }
+        this.tabs = tabs
+        return
       }
 
-      await this.fetchAction()
-      this.loading = false
-    },
-    fetchAction () {
-      this.actions = []
-      if (this.$route.meta.actions) {
-        this.actions = this.$route.meta.actions
+      // Regular guest networks with Source Nat have everything
+      if (this.resource && !this.resource.vpcid && this.resource.issourcenat) {
+        this.tabs = this.$route.meta.tabs
+        return
+      }
+
+      // Regular guest networks with Static Nat only have Firewall
+      if (this.resource && !this.resource.vpcid && this.resource.isstaticnat) {
+        this.tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'firewall'))
+        return
       }
 
-      if (this.portFWRuleCount > 0 || this.loadBalancerRuleCount > 0) {
-        this.actions = this.actions.filter(action => action.api !== 'enableStaticNat')
+      // Regular guest networks have all tabs
+      if (this.resource && !this.resource.vpcid) {
+        this.tabs = this.$route.meta.tabs
       }
     },
+    fetchAction () {
+      this.actions = this.$route.meta.actions || []
+    },
     fetchPortFWRule () {
       return new Promise((resolve, reject) => {
         api('listPortForwardingRules', {