[cloudstack] branch 4.15 updated: ui: Go back for delete actions before querying async job

[davidjumani]

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

davidjumani pushed a commit to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.15 by this push:
     new d01bdbc  ui: Go back for delete actions before querying async job
d01bdbc is described below

commit d01bdbcbb5eea5d2641be68ce9764191aa523067
Author: davidjumani <dj.davidjumani1...@gmail.com>
AuthorDate: Tue Aug 24 10:20:05 2021 +0530

    ui: Go back for delete actions before querying async job
---
 ui/src/views/AutogenView.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 5f408c7..05bec48 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -972,6 +972,9 @@ export default {
             break
           }
         }
+        if ((action.icon === 'delete' || ['archiveEvents', 'archiveAlerts', 
'unmanageVirtualMachine'].includes(action.api)) && this.dataView) {
+          this.$router.go(-1)
+        }
         if (['addLdapConfiguration', 
'deleteLdapConfiguration'].includes(action.api)) {
           this.$store.dispatch('UpdateConfiguration')
         }
@@ -1057,12 +1060,8 @@ export default {
         api(...args).then(json => {
           this.handleResponse(json, resourceName, action).then(jobId => {
             hasJobId = jobId
-            if ((action.icon === 'delete' || ['archiveEvents', 
'archiveAlerts', 'unmanageVirtualMachine'].includes(action.api)) && 
this.dataView) {
-              this.$router.go(-1)
-            } else {
-              if (!hasJobId) {
-                this.fetchData()
-              }
+            if (!hasJobId) {
+              this.fetchData()
             }
           })
           this.closeAction()