Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions Umbraco.Community.UmbNav/src/umbnav-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -228,13 +228,26 @@ export function convertToImageType(image: Guid): ImageItem {
}
}

function normalizeItemType(value: UmbNavLinkPickerLinkType | null | undefined): UmbNavLinkPickerLinkType | null | undefined {
if (!value) return value;
switch (value.toLowerCase()) {
case 'title': return 'Title';
case 'document': return 'Document';
case 'media': return 'Media';
case 'external': return 'External';
default: return value;
}
}

export function ensureNavItemKeys(value: ModelEntryType[]): ModelEntryType[] {
return value.map(item => ({
...item,
key: item.key ?? (uuidv4() as Guid),
unique: item.udi != null && (item.udi.startsWith('umb://document/') || item.udi.startsWith('umb://media/')) ? item.key : undefined,
itemType: item.udi != null && item.udi.startsWith('umb://document/') ? 'Document' :
item.udi != null && item.udi.startsWith('umb://media/') ? 'Media' : item.itemType,
itemType: normalizeItemType(
item.udi != null && item.udi.startsWith('umb://document/') ? 'Document' :
item.udi != null && item.udi.startsWith('umb://media/') ? 'Media' : item.itemType
),
// Always ensure children is an array so nested sorters can initialize
children: Array.isArray(item.children) ? ensureNavItemKeys(item.children) : []
}));
Expand Down