Merge pull request #7 from NethServer/dev6853

Update hostname format and error handling NethServer/dev#6853
NethServer · Feb 22, 2024 · 7178d09 · 7178d09
2 parents 98df82f + d1df832
commit 7178d09
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/imageroot/actions/configure-module/validate-input.json b/imageroot/actions/configure-module/validate-input.json
@@ -23,12 +23,14 @@
         "host_console": {
             "type": "string",
             "description": "Host name for the server, this host will be use by S3 clients",
-            "format": "idn-hostname"
+            "format": "hostname",
+            "pattern": "\\."
         },
         "host_server": {
             "type": "string",
             "description": "Host name for the UI, this how will serve the management UI",
-            "format": "idn-hostname"
+            "format": "hostname",
+            "pattern": "\\."
         },
         "lets_encrypt": {
             "type": "boolean",

diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json
@@ -34,7 +34,11 @@
     "enabled": "Enabled",
     "different": "API and web interface hosts must be different",
     "storage_path": "Storage path",
-    "storage_path_helper": "MinIO stores data in 'minio-data' by default. To use an external disk instead, enter a full path like '/mnt/data', make sure this location already exists and is a properly formatted and mounted disk. But remember, changing the storage path means it won't be part of the backup."
+    "storage_path_helper": "MinIO stores data in 'minio-data' by default. To use an external disk instead, enter a full path like '/mnt/data', make sure this location already exists and is a properly formatted and mounted disk. But remember, changing the storage path means it won't be part of the backup.",
+    "host_server_pattern": "Must be a valid fully qualified domain name",
+    "host_server_format": "Must be a valid fully qualified domain name",
+    "host_console_pattern": "Must be a valid fully qualified domain name",
+    "host_console_format": "Must be a valid fully qualified domain name"
   },
   "about": {
     "title": "About"

diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
@@ -24,15 +24,15 @@
               v-model="host_server"
               placeholder="minio.mydomain.org"
               :disabled="loading.getConfiguration || loading.configureModule"
-              :invalid-message="error.host_server"
+              :invalid-message="$t(error.host_server)"
               ref="host_server"
             ></cv-text-input>
             <cv-text-input
               :label="$t('settings.host_console')"
               v-model="host_console"
               placeholder="console.minio.mydomain.org"
               :disabled="loading.getConfiguration || loading.configureModule"
-              :invalid-message="error.host_console"
+              :invalid-message="$t(error.host_console)"
               ref="host_console"
             ></cv-text-input>
             <cv-toggle