diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index fec7f5f9625..5d02daa8b4d 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -3573,7 +3573,6 @@
"message.error.remove.tungsten.routing.policy": "Removing Tungsten-Fabric Routing Policy from Network failed",
"message.error.remove.vm.schedule": "Removing Instance Schedule failed",
"message.error.required.input": "Please enter input",
-"message.error.required.publicdomainsuffix": "Please enter the public domain suffix if the public server is enabled",
"message.error.reset.config": "Unable to reset config to default value",
"message.error.retrieve.kubeconfig": "Unable to retrieve Kubernetes Cluster config",
"message.error.routing.policy.term": "Community need to have the following format number:number",
diff --git a/ui/src/views/network/dns/AddDnsServer.vue b/ui/src/views/network/dns/AddDnsServer.vue
index c4fa35b0ba3..8b64e2d52d0 100644
--- a/ui/src/views/network/dns/AddDnsServer.vue
+++ b/ui/src/views/network/dns/AddDnsServer.vue
@@ -230,7 +230,7 @@ export default {
nameservers: this.form.nameservers || [],
ispublic: this.form.ispublic
}
- if (this.form.ispublic) {
+ if (this.form.publicdomainsuffix) {
params.publicdomainsuffix = this.form.publicdomainsuffix?.toLowerCase().trim()
}
await postAPI('addDnsServer', params)
@@ -315,12 +315,9 @@ export default {
return Promise.resolve()
},
validatePublicDomainSuffix (rule, value) {
- if (!this.form.ispublic) {
- return Promise.resolve()
- }
const normalized = value?.toLowerCase().trim()
if (!normalized) {
- return Promise.reject(new Error(this.$t('message.error.required.publicdomainsuffix')))
+ return Promise.resolve()
}
if (!FQDN_REGEX.test(normalized)) {
return Promise.reject(new Error('Invalid domain suffix'))
diff --git a/ui/src/views/network/dns/DnsRecordsTab.vue b/ui/src/views/network/dns/DnsRecordsTab.vue
index 3f7f7187ea4..88fcb9e2475 100644
--- a/ui/src/views/network/dns/DnsRecordsTab.vue
+++ b/ui/src/views/network/dns/DnsRecordsTab.vue
@@ -22,7 +22,6 @@
shape="round"
style="float: right;margin-bottom: 10px; z-index: 8"
@click="() => { showAddForm = true }">
-
{{ $t('label.dns.create.record') }}
@@ -44,7 +43,7 @@
{{ record.ttl }}
-
+
{
this.$notification.success({
diff --git a/ui/src/views/network/dns/UpdateDnsServer.vue b/ui/src/views/network/dns/UpdateDnsServer.vue
index bbe527fe2eb..2567cda6355 100644
--- a/ui/src/views/network/dns/UpdateDnsServer.vue
+++ b/ui/src/views/network/dns/UpdateDnsServer.vue
@@ -201,8 +201,8 @@ export default {
if (dnsapikey) {
params.dnsapikey = dnsapikey
}
- if (this.form.ispublic) {
- params.publicdomainsuffix = this.form.publicdomainsuffix?.trim().toLowerCase()
+ if (this.form.publicdomainsuffix) {
+ params.publicdomainsuffix = this.form.publicdomainsuffix?.toLowerCase().trim()
}
await postAPI('updateDnsServer', params)
this.$notification.success({
@@ -269,12 +269,9 @@ export default {
return Promise.resolve()
},
validatePublicDomainSuffix (rule, value) {
- if (!this.form.ispublic) {
- return Promise.resolve()
- }
const normalized = value?.toLowerCase().trim()
if (!normalized) {
- return Promise.reject(new Error(this.$t('message.error.required.publicdomainsuffix')))
+ return Promise.resolve()
}
if (!FQDN_REGEX.test(normalized)) {
return Promise.reject(new Error('Invalid domain suffix'))