TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-23 22:11:09 +03:00
Code Issues Projects Releases Wiki Activity

Updated add navigation button to validate the new item

Browse Source 
refs https://github.com/TryGhost/Team/issues/3433
This commit is contained in:
Jono Mingard 2023-06-20 19:58:27 +10:00
parent 0b0c36a7fb
commit 5a6421c8bb
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ghost/admin-x-settings/src/hooks/site/useNavigationEditor.tsx
View File

@ -46,12 +46,32 @@ const useNavigationEditor = ({items, setItems}: {
}
}, [editableItems, newItem, isEditingNewItem, items, setItems]);
const urlRegex = new RegExp(/^(\/|#|[a-zA-Z0-9-]+:)/);
const validateItem = (item: EditableItem) => {
const errors: NavigationItemErrors = {};
if (!item.label || item.label.match(/^\s*$/)) {
errors.label = 'You must specify a label';
}
if (!item.url || item.url.match(/\s/) || (!validator.isURL(item.url, {require_protocol: true}) && !item.url.match(urlRegex))) {
errors.url = 'You must specify a valid URL or relative path';
}
return errors;
};
const updateItem = (id: string, item: Partial<NavigationItem>) => {
setEditableItems(editableItems.map(current => (current.id === id ? {...current, ...item} : current)));
};
const addItem = () => {
if (newItem.label && newItem.url) {
const errors = validateItem(newItem);
if (Object.values(errors).some(message => message)) {
setNewItem({...newItem, errors});
} else {
setEditableItems(editableItems.concat({...newItem, id: editableItems.length.toString(), errors: {}}));
setNewItem({label: '', url: '/', id: 'new', errors: {}});
}
@ -77,22 +97,6 @@ const useNavigationEditor = ({items, setItems}: {
}
};
const urlRegex = new RegExp(/^(\/|#|[a-zA-Z0-9-]+:)/);
const validateItem = (item: EditableItem) => {
const errors: NavigationItemErrors = {};
if (!item.label || item.label.match(/^\s*$/)) {
errors.label = 'You must specify a label';
}
if (!item.url || item.url.match(/\s/) || (!validator.isURL(item.url, {require_protocol: true}) && !item.url.match(urlRegex))) {
errors.url = 'You must specify a valid URL or relative path';
}
return errors;
};
return {
items: editableItems,