Skip to content

UI: fix 'Next' button is stuck if no public ip range #7198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 2 commits into from
Feb 13, 2023
Merged

UI: fix 'Next' button is stuck if no public ip range #7198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ac3dcd
UI: fix 'Next' button if no public ip range
weizhouapache Feb 13, 2023
4030685
UI: add back removed label message.error.ipv4.dns1
weizhouapache Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ui/public/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2534,6 +2534,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",
Expand Down
5 changes: 4 additions & 1 deletion ui/src/views/infra/zone/IpAddressRangeForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -260,6 +262,7 @@ export default {
},
handleSubmit () {
if (this.isValidSetup()) {
this.showError = false
if (this.isFixError) {
this.$emit('submitLaunchZone')
return
Expand Down