From 933970d9da0791ae0867ed9c3d2b318b4029660a Mon Sep 17 00:00:00 2001
From: Wei Zhou <weizhou@apache.org>
Date: Mon, 13 Feb 2023 14:53:25 +0100
Subject: [PATCH] UI: fix 'Next' button is stuck if no public ip range (#7198)

---
 ui/public/locales/en.json                      | 1 +
 ui/src/views/infra/zone/IpAddressRangeForm.vue | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index 1b2c7fb1245..c1ef11bb48f 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -2553,6 +2553,7 @@
 "message.error.invalid.autoscale.vmgroup.name": "Invalid AutoScale VM group name. It can contain the ASCII letters 'a' through 'z', 'A' through 'Z', the digits '0' through '9' and the hyphen ('-'), must be between 1 and 255 characters long.",
 "message.error.ip.range": "Please enter valid range.",
 "message.error.ipv4.address": "Please enter a valid IPv4 address.",
+"message.error.ipv4.dns1": "Please enter IpV4 DNS 1",
 "message.error.ipv4.dns2": "Please enter IpV4 DNS 2",
 "message.error.ipv6.address": "Please enter a valid IP v6 address.",
 "message.error.ipv6.gateway": "Please enter IpV6 Gateway",
diff --git a/ui/src/views/infra/zone/IpAddressRangeForm.vue b/ui/src/views/infra/zone/IpAddressRangeForm.vue
index 0a779cc3c23..b851ad94384 100644
--- a/ui/src/views/infra/zone/IpAddressRangeForm.vue
+++ b/ui/src/views/infra/zone/IpAddressRangeForm.vue
@@ -110,14 +110,16 @@
       </div>
     </div>
     <a-modal
+      v-if="showError"
       :visible="showError"
       :closable="true"
       :maskClosable="false"
       :title="`${$t('label.error')}!`"
+      :footer="null"
       @cancel="showError = false"
       centered
     >
-      <div v-ctrl-enter="showError = false">
+      <div v-ctrl-enter="() => showError = false">
         <span>{{ $t('message.required.add.least.ip') }}</span>
         <div :span="24" class="action-button">
           <a-button @click="showError = false">{{ $t('label.cancel') }}</a-button>
@@ -260,6 +262,7 @@ export default {
     },
     handleSubmit () {
       if (this.isValidSetup()) {
+        this.showError = false
         if (this.isFixError) {
           this.$emit('submitLaunchZone')
           return