From 84e52c92632730f33894ae474e0243aee3cd5ad2 Mon Sep 17 00:00:00 2001 From: davidjumani Date: Wed, 21 Jul 2021 14:00:32 +0530 Subject: [PATCH] ui: Fix async poll job (#5221) --- ui/src/views/compute/MigrateVMStorage.vue | 8 ++------ ui/src/views/network/EgressRulesTab.vue | 9 ++------- ui/src/views/network/FirewallRules.vue | 9 ++------- ui/src/views/network/IpAddressesTab.vue | 9 ++------- ui/src/views/network/LoadBalancing.vue | 9 ++------- ui/src/views/network/PortForwarding.vue | 9 ++------- 6 files changed, 12 insertions(+), 41 deletions(-) diff --git a/ui/src/views/compute/MigrateVMStorage.vue b/ui/src/views/compute/MigrateVMStorage.vue index d52f8514070..f8e7c0ebbee 100644 --- a/ui/src/views/compute/MigrateVMStorage.vue +++ b/ui/src/views/compute/MigrateVMStorage.vue @@ -173,13 +173,9 @@ export default { } else { jobId = response.migratevirtualmachine.jobid } - this.$store.dispatch('AddAsyncJob', { - title: `${this.$t('label.migrating')} ${this.resource.name}`, - jobid: jobId, - description: this.resource.name, - status: 'progress' - }) this.$pollJob({ + title: `${this.$t('label.migrating')} ${this.resource.name}`, + description: this.resource.name, jobId: jobId, successMessage: `${this.$t('message.success.migrating')} ${this.resource.name}`, successMethod: () => { diff --git a/ui/src/views/network/EgressRulesTab.vue b/ui/src/views/network/EgressRulesTab.vue index b9fa2a9752e..42d770647df 100644 --- a/ui/src/views/network/EgressRulesTab.vue +++ b/ui/src/views/network/EgressRulesTab.vue @@ -288,15 +288,10 @@ export default { this.loading = true api('deleteEgressFirewallRule', { id: rule.id }).then(response => { const jobId = response.deleteegressfirewallruleresponse.jobid - this.$store.dispatch('AddAsyncJob', { - title: this.$t('label.action.delete.egress.firewall'), - jobid: jobId, - description: rule.id, - status: 'progress', - bulkAction: this.selectedItems.length > 0 && this.showGroupActionModal - }) eventBus.$emit('update-job-details', jobId, null) this.$pollJob({ + title: this.$t('label.action.delete.egress.firewall'), + description: rule.id, jobId: jobId, successMessage: this.$t('message.success.remove.egress.rule'), successMethod: () => { diff --git a/ui/src/views/network/FirewallRules.vue b/ui/src/views/network/FirewallRules.vue index 0c0451fe136..fa536b5a0f6 100644 --- a/ui/src/views/network/FirewallRules.vue +++ b/ui/src/views/network/FirewallRules.vue @@ -331,15 +331,10 @@ export default { this.loading = true api('deleteFirewallRule', { id: rule.id }).then(response => { const jobId = response.deletefirewallruleresponse.jobid - this.$store.dispatch('AddAsyncJob', { - title: this.$t('label.action.delete.firewall'), - jobid: jobId, - description: rule.id, - status: 'progress', - bulkAction: this.selectedItems.length > 0 && this.showGroupActionModal - }) eventBus.$emit('update-job-details', jobId, null) this.$pollJob({ + title: this.$t('label.action.delete.firewall'), + description: rule.id, jobId: jobId, successMessage: this.$t('message.success.remove.firewall.rule'), successMethod: () => { diff --git a/ui/src/views/network/IpAddressesTab.vue b/ui/src/views/network/IpAddressesTab.vue index 106463945a1..5490a4f1bdd 100644 --- a/ui/src/views/network/IpAddressesTab.vue +++ b/ui/src/views/network/IpAddressesTab.vue @@ -389,15 +389,10 @@ export default { id: ip.id }).then(response => { const jobId = response.disassociateipaddressresponse.jobid - this.$store.dispatch('AddAsyncJob', { - title: this.$t('label.action.release.ip'), - jobid: jobId, - description: ip.id, - status: 'progress', - bulkAction: this.selectedItems.length > 0 && this.showGroupActionModal - }) eventBus.$emit('update-job-details', jobId, null) this.$pollJob({ + title: this.$t('label.action.release.ip'), + description: ip.id, jobId: jobId, successMessage: this.$t('message.success.release.ip'), successMethod: () => { diff --git a/ui/src/views/network/LoadBalancing.vue b/ui/src/views/network/LoadBalancing.vue index 879afef9468..d95d6a4cdd5 100644 --- a/ui/src/views/network/LoadBalancing.vue +++ b/ui/src/views/network/LoadBalancing.vue @@ -1023,15 +1023,10 @@ export default { id: rule.id }).then(response => { const jobId = response.deleteloadbalancerruleresponse.jobid - this.$store.dispatch('AddAsyncJob', { - title: this.$t('label.action.delete.load.balancer'), - jobid: jobId, - description: rule.id, - status: 'progress', - bulkAction: this.selectedItems.length > 0 && this.showGroupActionModal - }) eventBus.$emit('update-job-details', jobId, null) this.$pollJob({ + title: this.$t('label.action.delete.load.balancer'), + description: rule.id, jobId: jobId, successMessage: this.$t('message.success.remove.rule'), successMethod: () => { diff --git a/ui/src/views/network/PortForwarding.vue b/ui/src/views/network/PortForwarding.vue index a4c0067a209..2a5a0b7e4e8 100644 --- a/ui/src/views/network/PortForwarding.vue +++ b/ui/src/views/network/PortForwarding.vue @@ -523,15 +523,10 @@ export default { this.loading = true api('deletePortForwardingRule', { id: rule.id }).then(response => { const jobId = response.deleteportforwardingruleresponse.jobid - this.$store.dispatch('AddAsyncJob', { - title: this.$t('label.portforwarding.rule'), - jobid: jobId, - description: rule.id, - status: 'progress', - bulkAction: this.selectedItems.length > 0 && this.showGroupActionModal - }) eventBus.$emit('update-job-details', jobId, null) this.$pollJob({ + title: this.$t('label.portforwarding.rule'), + description: rule.id, jobId: jobId, successMessage: this.$t('message.success.remove.port.forward'), successMethod: () => {