diff --git a/ui/src/views/compute/MigrateVMStorage.vue b/ui/src/views/compute/MigrateVMStorage.vue index d52f85140708..f8e7c0ebbee6 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', { + this.$pollJob({ title: `${this.$t('label.migrating')} ${this.resource.name}`, - jobid: jobId, description: this.resource.name, - status: 'progress' - }) - this.$pollJob({ 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 9ce2170a9e8b..c7c440b8e1ca 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 0d49e5add984..c5b554afce0f 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 21263b813016..0cc5419cfa75 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 08e99fa84616..953a5dcf94e6 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 2069e99cbff3..da08f7b8fbce 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: () => {