Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,47 @@ describe('buildTree', () => {
createMenuItem('item4', 'Item 4', 'icon4'),
],
},
{
description:
'should preserve title/titleKey/icon/to from first entry when merging same name (e.g. dynamic route + menuItems parent)',
input: [
{
name: 'default.admin',
title: 'Administration',
titleKey: 'menuItem.administration',
icon: 'admin',
children: [],
},
{
name: 'extensions',
title: 'Extensions',
titleKey: 'menuItem.extensions',
parent: 'default.admin',
icon: 'pluginsIcon',
to: '/extensions',
children: [],
} as MenuItem,
],
expectedOutput: [
{
name: 'default.admin',
title: 'Administration',
titleKey: 'menuItem.administration',
icon: 'admin',
children: [
{
name: 'extensions',
title: 'Extensions',
titleKey: 'menuItem.extensions',
icon: 'pluginsIcon',
to: '/extensions',
parent: 'default.admin',
children: [],
},
],
},
],
},
];

it.each(testCases)('$description', ({ input, expectedOutput }) => {
Expand Down
10 changes: 8 additions & 2 deletions packages/app/src/utils/dynamicUI/extractDynamicConfigFrontend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,16 @@ export function buildTree(menuItemsArray: MenuItem[]): MenuItem[] {
if (!itemMap[item.name]) {
itemMap[item.name] = { ...item, children: [] };
} else {
const existing = itemMap[item.name];
itemMap[item.name] = {
...itemMap[item.name],
...existing,
...item,
children: itemMap[item.name].children,
children: existing.children,
// Preserve from existing when incoming has none (e.g. menuItems only adds parent)
title: item.title ?? existing.title,
titleKey: item.titleKey ?? existing.titleKey,
icon: item.icon ?? existing.icon,
to: item.to ?? existing.to,
};
}
});
Expand Down
Loading