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.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2020-05-11 16:46:21 +05:30
parent 363db53db8
commit cfb3194bbf
4 changed files with 10 additions and 4 deletions

View File

@ -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"
>

View File

@ -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) {

View File

@ -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: [
{

View File

@ -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) {