Prevent form from closing if validation fails (#651)

* Prevent form from closing if validation fails

* Prevent closing on failure for custom forms

* Fixing group actions

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: davidjumani

ui/src/views/AutogenView.vue

@@ -984,13 +984,13 @@ export default {
             if (!hasJobId) {
               this.fetchData()
             }
+            this.closeAction()
           }
         }).catch(error => {
           console.log(error)
           this.$notifyError(error)
         }).finally(f => {
           this.actionLoading = false
-          this.closeAction()
         })
       })
     },

ui/src/views/compute/AssignInstance.vue

@@ -212,13 +212,12 @@ export default {
         this.$notification.success({
           message: this.$t('label.loadbalancerinstance')
         })
-        this.loading = false
         this.$parent.$parent.close()
         this.parentFetchData()
       }).catch(error => {
         this.$notifyError(error)
-        this.$parent.$parent.close()
-        this.parentFetchData()
+      }).finally(() => {
+        this.loading = false
       })
     }
   }

ui/src/views/compute/AttachIso.vue

@@ -135,11 +135,11 @@ export default {
               catchMessage: this.$t('error.fetching.async.job.result')
             })
           }
+          this.closeAction()
         }).catch(error => {
           this.$notifyError(error)
         }).finally(() => {
           this.loading = false
-          this.closeAction()
         })
       })
     }

ui/src/views/compute/ChangeAffinity.vue

@@ -154,8 +154,6 @@ export default {
         this.parentFetchData()
       }).catch(error => {
         this.$notifyError(error)
-        this.$parent.$parent.close()
-        this.parentFetchData()
       }).finally(() => {
         this.loading = false
       })

ui/src/views/compute/CreateKubernetesCluster.vue

@@ -485,12 +485,12 @@ export default {
               this.$emit('refresh-data')
             }
           })
+          this.closeAction()
+          this.$emit('refresh-data')
         }).catch(error => {
           this.$notifyError(error)
         }).finally(() => {
-          this.$emit('refresh-data')
           this.loading = false
-          this.closeAction()
         })
       })
     },

ui/src/views/compute/DestroyVM.vue

@@ -136,12 +136,12 @@ export default {
             catchMessage: this.$t('error.fetching.async.job.result'),
             successMessage: `${this.$t('message.success.delete.vm')} ${this.resource.name}`
           })
+          this.parentFetchData()
+          this.closeAction()
         }).catch(error => {
           this.$notifyError(error)
         }).finally(() => {
           this.loading = false
-          this.parentFetchData()
-          this.closeAction()
         })
       })
     },

ui/src/views/compute/ScaleKubernetesCluster.vue

@@ -198,12 +198,12 @@ export default {
               this.$emit('refresh-data')
             }
           })
+          this.closeAction()
+          this.$emit('refresh-data')
         }).catch(error => {
           this.$notifyError(error)
         }).finally(() => {
-          this.$emit('refresh-data')
           this.loading = false
-          this.closeAction()
         })
       })
     },

ui/src/views/compute/ScaleVM.vue

@@ -182,8 +182,6 @@ export default {
         this.parentFetchData()
       }).catch(error => {
         this.$notifyError(error)
-        this.$parent.$parent.close()
-        this.parentFetchData()
       }).finally(() => {
         this.loading = false
       })

ui/src/views/compute/UpgradeKubernetesCluster.vue

@@ -170,12 +170,12 @@ export default {
               this.$emit('refresh-data')
             }
           })
+          this.$emit('refresh-data')
+          this.closeAction()
         }).catch(error => {
           this.$notifyError(error)
         }).finally(() => {
-          this.$emit('refresh-data')
           this.loading = false
-          this.closeAction()
         })
       })
     },

ui/src/views/iam/AddAccount.vue

@@ -383,12 +383,10 @@ export default {
                   description: (error.response && error.response.headers && error.response.headers['x-description']) || error.message,
                   duration: 0
                 })
-              }).finally(() => {
-                this.loading = false
-                this.closeAction()
               })
             }
           }
+          this.closeAction()
         }).catch(error => {
           this.$notification.error({
             message: this.$t('message.request.failed'),
@@ -397,7 +395,6 @@ export default {
           })
         }).finally(() => {
           this.loading = false
-          this.closeAction()
         })
       })
     },