dearsky/ntfy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add validation to "add user" dialog, closes #1566

Browse Source
This commit is contained in:
binwiederhier
2026-02-01 12:33:19 -05:00
parent 4546eb02a1
commit 63e9b8425f
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web/src/components/Preferences.jsx
View File

@@ -429,13 +429,14 @@ const UserDialog = (props) => {
const [password, setPassword] = useState("");
const fullScreen = useMediaQuery(theme.breakpoints.down("sm"));
const editMode = props.user !== null;
const baseUrlValid = baseUrl.length === 0 || validUrl(baseUrl);
const baseUrlExists = props.users?.map((user) => user.baseUrl).includes(baseUrl);
const baseUrlError = baseUrl.length > 0 && (!baseUrlValid || baseUrlExists);
const addButtonEnabled = (() => {
if (editMode) {
return username.length > 0 && password.length > 0;
}
const baseUrlValid = validUrl(baseUrl);
const baseUrlExists = props.users?.map((user) => user.baseUrl).includes(baseUrl);
return baseUrlValid && !baseUrlExists && username.length > 0 && password.length > 0;
return validUrl(baseUrl) && !baseUrlExists && username.length > 0 && password.length > 0;
})();
const handleSubmit = async () => {
props.onSubmit({
@@ -467,6 +468,14 @@ const UserDialog = (props) => {
type="url"
fullWidth
variant="standard"
error={baseUrlError}
helperText={
baseUrl.length > 0 && !baseUrlValid
? t("prefs_users_dialog_base_url_invalid")
: baseUrlExists
? t("prefs_users_dialog_base_url_exists")
: ""
}
/>
)}
<TextField