update UI changes as per upstream fix

Author: Pearl1594

ui/src/views/network/PublicIpResource.vue

@@ -146,26 +146,24 @@ export default {
         // VPC IPs don't have firewall
         const tabs = this.$route.meta.tabs.filter(tab => tab.name !== 'firewall')
 
-        console.log(this.resource.networkofferingconservemode)
-        if (this.resource.networkofferingconservemode) {
+        const network = await this.fetchNetwork()
+        if (network && network.networkofferingconservemode) {
           this.tabs = tabs
           return
         }
 
         this.portFWRuleCount = await this.fetchPortFWRule()
         this.loadBalancerRuleCount = await this.fetchLoadBalancerRule()
-        console.log(this.portFWRuleCount)
-        console.log(this.loadBalancerRuleCount)
 
         // VPC IPs with PF only have PF
-        // if (this.portFWRuleCount > 0) {
-        //   tabs = tabs.filter(tab => tab.name !== 'loadbalancing')
-        // }
+        if (this.portFWRuleCount > 0) {
+          tabs = tabs.filter(tab => tab.name !== 'loadbalancing')
+        }
 
-        // // VPC IPs with LB rules only have LB
-        // if (this.loadBalancerRuleCount > 0) {
-        //   tabs = tabs.filter(tab => tab.name !== 'portforwarding')
-        // }
+        // VPC IPs with LB rules only have LB
+        if (this.loadBalancerRuleCount > 0) {
+          tabs = tabs.filter(tab => tab.name !== 'portforwarding')
+        }
         this.tabs = tabs
         return
       }
@@ -189,6 +187,20 @@ export default {
     fetchAction () {
       this.actions = this.$route.meta.actions || []
     },
+    fetchNetwork () {
+      return new Promise((resolve, reject) => {
+        api('listNetworks', {
+          listAll: true,
+          projectid: this.resource.projectid,
+          id: this.resource.associatednetworkid
+        }).then(json => {
+          const network = json.listnetworksresponse?.network?.[0] || null
+          resolve(network)
+        }).catch(e => {
+          reject(e)
+        })
+      })
+    },
     fetchPortFWRule () {
       return new Promise((resolve, reject) => {
         api('listPortForwardingRules', {