fix: trim values before form validation

This commit is contained in:
Sonny
2024-11-08 18:19:37 +01:00
committed by Sonny
parent 174a21288a
commit 9781363282
2 changed files with 14 additions and 8 deletions

View File

@@ -21,11 +21,13 @@ export default function EditCollectionPage({
nextId: collection.nextId, nextId: collection.nextId,
}); });
const canSubmit = useMemo<boolean>(() => { const canSubmit = useMemo<boolean>(() => {
const trimmedName = data.name.trim();
const trimmedDescription = data.description?.trim();
const isFormEdited = const isFormEdited =
data.name !== collection.name || trimmedName !== collection.name ||
data.description !== collection.description || trimmedDescription !== collection.description ||
data.visibility !== collection.visibility; data.visibility !== collection.visibility;
const isFormValid = data.name !== ''; const isFormValid = trimmedName !== '';
return isFormEdited && isFormValid && !processing; return isFormEdited && isFormValid && !processing;
}, [data, collection]); }, [data, collection]);

View File

@@ -22,16 +22,20 @@ export default function EditLinkPage({
collectionId: link.collectionId, collectionId: link.collectionId,
}); });
const canSubmit = useMemo<boolean>(() => { const canSubmit = useMemo<boolean>(() => {
const trimmedName = data.name.trim();
const trimmedDescription = data.description?.trim();
const trimmedUrl = data.url.trim();
const isFormEdited = const isFormEdited =
data.name !== link.name || trimmedName !== link.name ||
data.url !== link.url || trimmedUrl !== link.url ||
data.description !== link.description || trimmedDescription !== link.description ||
data.favorite !== link.favorite || data.favorite !== link.favorite ||
data.collectionId !== link.collectionId; data.collectionId !== link.collectionId;
const isFormValid = const isFormValid =
data.name !== '' && trimmedName !== '' &&
isValidHttpUrl(data.url) && isValidHttpUrl(trimmedUrl) &&
data.favorite !== null && data.favorite !== null &&
data.collectionId !== null; data.collectionId !== null;