Skip to content
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

Update hostname format and error handling #7

Merged
merged 3 commits into from
Feb 22, 2024
Merged

Update hostname format and error handling #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26603b4
Update hostname format in validate-input.json
stephdl Feb 21, 2024
0410be1
Add validation for host server and console names in translation.json
stephdl Feb 21, 2024
d1df832
Update error translation handling in Settings.vue
stephdl Feb 21, 2024
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
6 changes: 4 additions & 2 deletions imageroot/actions/configure-module/validate-input.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 5 additions & 1 deletion ui/public/i18n/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions ui/src/views/Settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading