Skip to content

Commit 35dff76

Browse files
committed
ui: Fix async poll job
1 parent 908bf98 commit 35dff76

File tree

6 files changed

+11
-40
lines changed

6 files changed

+11
-40
lines changed

ui/src/views/compute/MigrateVMStorage.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,9 @@ export default {
173173
} else {
174174
jobId = response.migratevirtualmachine.jobid
175175
}
176-
this.$store.dispatch('AddAsyncJob', {
176+
this.$pollJob({
177177
title: `${this.$t('label.migrating')} ${this.resource.name}`,
178-
jobid: jobId,
179178
description: this.resource.name,
180-
status: 'progress'
181-
})
182-
this.$pollJob({
183179
jobId: jobId,
184180
successMessage: `${this.$t('message.success.migrating')} ${this.resource.name}`,
185181
successMethod: () => {

ui/src/views/network/EgressRulesTab.vue

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,15 +288,10 @@ export default {
288288
this.loading = true
289289
api('deleteEgressFirewallRule', { id: rule.id }).then(response => {
290290
const jobId = response.deleteegressfirewallruleresponse.jobid
291-
this.$store.dispatch('AddAsyncJob', {
292-
title: this.$t('label.action.delete.egress.firewall'),
293-
jobid: jobId,
294-
description: rule.id,
295-
status: 'progress',
296-
bulkAction: this.selectedItems.length > 0 && this.showGroupActionModal
297-
})
298291
eventBus.$emit('update-job-details', jobId, null)
299292
this.$pollJob({
293+
title: this.$t('label.action.delete.egress.firewall'),
294+
description: rule.id,
300295
jobId: jobId,
301296
successMessage: this.$t('message.success.remove.egress.rule'),
302297
successMethod: () => {

ui/src/views/network/FirewallRules.vue

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -331,15 +331,10 @@ export default {
331331
this.loading = true
332332
api('deleteFirewallRule', { id: rule.id }).then(response => {
333333
const jobId = response.deletefirewallruleresponse.jobid
334-
this.$store.dispatch('AddAsyncJob', {
335-
title: this.$t('label.action.delete.firewall'),
336-
jobid: jobId,
337-
description: rule.id,
338-
status: 'progress',
339-
bulkAction: this.selectedItems.length > 0 && this.showGroupActionModal
340-
})
341334
eventBus.$emit('update-job-details', jobId, null)
342335
this.$pollJob({
336+
title: this.$t('label.action.delete.firewall'),
337+
description: rule.id,
343338
jobId: jobId,
344339
successMessage: this.$t('message.success.remove.firewall.rule'),
345340
successMethod: () => {

ui/src/views/network/IpAddressesTab.vue

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -389,15 +389,10 @@ export default {
389389
id: ip.id
390390
}).then(response => {
391391
const jobId = response.disassociateipaddressresponse.jobid
392-
this.$store.dispatch('AddAsyncJob', {
393-
title: this.$t('label.action.release.ip'),
394-
jobid: jobId,
395-
description: ip.id,
396-
status: 'progress',
397-
bulkAction: this.selectedItems.length > 0 && this.showGroupActionModal
398-
})
399392
eventBus.$emit('update-job-details', jobId, null)
400393
this.$pollJob({
394+
title: this.$t('label.action.release.ip'),
395+
description: ip.id,
401396
jobId: jobId,
402397
successMessage: this.$t('message.success.release.ip'),
403398
successMethod: () => {

ui/src/views/network/LoadBalancing.vue

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,15 +1023,10 @@ export default {
10231023
id: rule.id
10241024
}).then(response => {
10251025
const jobId = response.deleteloadbalancerruleresponse.jobid
1026-
this.$store.dispatch('AddAsyncJob', {
1027-
title: this.$t('label.action.delete.load.balancer'),
1028-
jobid: jobId,
1029-
description: rule.id,
1030-
status: 'progress',
1031-
bulkAction: this.selectedItems.length > 0 && this.showGroupActionModal
1032-
})
10331026
eventBus.$emit('update-job-details', jobId, null)
10341027
this.$pollJob({
1028+
title: this.$t('label.action.delete.load.balancer'),
1029+
description: rule.id,
10351030
jobId: jobId,
10361031
successMessage: this.$t('message.success.remove.rule'),
10371032
successMethod: () => {

ui/src/views/network/PortForwarding.vue

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -523,15 +523,10 @@ export default {
523523
this.loading = true
524524
api('deletePortForwardingRule', { id: rule.id }).then(response => {
525525
const jobId = response.deleteportforwardingruleresponse.jobid
526-
this.$store.dispatch('AddAsyncJob', {
527-
title: this.$t('label.portforwarding.rule'),
528-
jobid: jobId,
529-
description: rule.id,
530-
status: 'progress',
531-
bulkAction: this.selectedItems.length > 0 && this.showGroupActionModal
532-
})
533526
eventBus.$emit('update-job-details', jobId, null)
534527
this.$pollJob({
528+
title: this.$t('label.portforwarding.rule'),
529+
description: rule.id,
535530
jobId: jobId,
536531
successMessage: this.$t('message.success.remove.port.forward'),
537532
successMethod: () => {

0 commit comments

Comments
 (0)