From aee7bb9e342832d4a9da9177bb7296cf8423848f Mon Sep 17 00:00:00 2001
From: hooklee2000 <52850777+hooklee2000@users.noreply.github.com>
Date: Tue, 28 Jun 2022 13:23:25 +0800
Subject: [PATCH] UI fix message.add.vpn.customer.gateway.failed when catched
 error (#6493)

* UI fix message.add.vpn.customer.gateway.failed when catched error

* fix UI VPC add ACL  without required input  close ui

Without any input, click ok button then close the ui . We need display ui to confirm all required input.

* remove commented line
---
 ui/src/views/network/CreateVpnCustomerGateway.vue | 2 +-
 ui/src/views/network/VpcTab.vue                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/views/network/CreateVpnCustomerGateway.vue b/ui/src/views/network/CreateVpnCustomerGateway.vue
index 7144e273bd3..b890e2968a7 100644
--- a/ui/src/views/network/CreateVpnCustomerGateway.vue
+++ b/ui/src/views/network/CreateVpnCustomerGateway.vue
@@ -341,7 +341,7 @@ export default {
           this.formRef.value.resetFields()
         }).catch(error => {
           console.error(error)
-          this.$message.error(this.$t('message.success.add.vpn.customer.gateway'))
+          this.$message.error(this.$t('message.add.vpn.customer.gateway.failed'))
           this.isSubmitted = false
         })
       }).catch(error => {
diff --git a/ui/src/views/network/VpcTab.vue b/ui/src/views/network/VpcTab.vue
index 2aee72cd43a..0183764562b 100644
--- a/ui/src/views/network/VpcTab.vue
+++ b/ui/src/views/network/VpcTab.vue
@@ -822,7 +822,6 @@ export default {
     handleNetworkAclFormSubmit () {
       if (this.fetchLoading) return
       this.fetchLoading = true
-      this.modals.networkAcl = false
 
       this.formRef.value.validate().then(() => {
         const values = toRaw(this.form)
@@ -852,6 +851,7 @@ export default {
         }).catch(error => {
           this.$notifyError(error)
         }).finally(() => {
+          this.modals.networkAcl = false
           this.fetchLoading = false
           this.fetchAclList()
         })