[cloudstack-primate] branch master updated: network: fix assorted list of minor bugs

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git


The following commit(s) were added to refs/heads/master by this push:
     new 71766bd  network: fix assorted list of minor bugs
71766bd is described below

commit 71766bd06f1f8bd2e84d45804b1b0b5ab26b8834
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Mon May 11 16:46:21 2020 +0530

    network: fix assorted list of minor bugs
    
    - Show the VPN tab only for sourcenat IPs
    - Go back on archiving alerts
    - Show PF, LB tabs for IPs on VPCs
    
    Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
---
 src/components/view/ListView.vue     | 2 +-
 src/components/view/ResourceView.vue | 7 ++++++-
 src/config/section/network.js        | 3 ++-
 src/views/AutogenView.vue            | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/view/ListView.vue b/src/components/view/ListView.vue
index 345d620..004480a 100644
--- a/src/components/view/ListView.vue
+++ b/src/components/view/ListView.vue
@@ -23,7 +23,7 @@
     :dataSource="items"
     :rowKey="record => record.id || record.name"
     :pagination="false"
-    :rowSelection="['vm', 'event', 'alert'].includes($route.name) ? 
{selectedRowKeys: selectedRowKeys, onChange: onSelectChange} : null"
+    :rowSelection="['vm-tbd', 'event-tbd', 'alert-tbd'].includes($route.name) 
? {selectedRowKeys: selectedRowKeys, onChange: onSelectChange} : null"
     :rowClassName="getRowClassName"
     style="overflow-y: auto"
   >
diff --git a/src/components/view/ResourceView.vue 
b/src/components/view/ResourceView.vue
index d2fdf0c..d0d68d0 100644
--- a/src/components/view/ResourceView.vue
+++ b/src/components/view/ResourceView.vue
@@ -107,7 +107,12 @@ export default {
     },
     showHideTab (tab) {
       if ('networkServiceFilter' in tab) {
-        if (this.resource.virtualmachineid && tab.name !== 'Firewall') return 
false
+        if (this.resource.virtualmachineid && tab.name !== 'Firewall') {
+          return false
+        }
+        if (this.resource && this.resource.vpcid && tab.name !== 'Firewall') {
+          return true
+        }
         return this.networkService && this.networkService.service &&
           tab.networkServiceFilter(this.networkService.service)
       } else if ('show' in tab) {
diff --git a/src/config/section/network.js b/src/config/section/network.js
index 6f42198..8a0e977 100644
--- a/src/config/section/network.js
+++ b/src/config/section/network.js
@@ -214,7 +214,8 @@ export default {
         networkServiceFilter: networkService => networkService.filter(x => 
x.name === 'Lb').length > 0
       }, {
         name: 'VPN',
-        component: () => import('@/views/network/VpnDetails.vue')
+        component: () => import('@/views/network/VpnDetails.vue'),
+        show: (record) => { return record.issourcenat }
       }],
       actions: [
         {
diff --git a/src/views/AutogenView.vue b/src/views/AutogenView.vue
index 3eb17fe..f2ebc7e 100644
--- a/src/views/AutogenView.vue
+++ b/src/views/AutogenView.vue
@@ -781,7 +781,7 @@ export default {
                 break
               }
             }
-            if ((this.currentAction.icon === 'delete' || 
['archiveEvents'].includes(this.currentAction.api)) && this.dataView) {
+            if ((this.currentAction.icon === 'delete' || ['archiveEvents', 
'archiveAlerts'].includes(this.currentAction.api)) && this.dataView) {
               this.$router.go(-1)
             } else {
               if (!hasJobId) {