Skip to content

Commit 1d10df6

Browse files
committed
Add empty routes support for Navi
1 parent f242250 commit 1d10df6

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/shared/actions/contentful.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,10 @@ async function getMenuDone(menuProps) {
240240
} else {
241241
menu = menuData;
242242
}
243-
// add the preconfigured secondary menus
244-
menu[0].secondaryMenuForLoggedInUser = config.SECONDARY_MENU_FOR_LOGGED_USER;
245-
menu[0].secondaryMenuForGuest = config.SECONDARY_MENU_FOR_GUEST;
243+
// add the preconfigured secondary menus?
244+
if (fields.showSecondaryNaviMenu) {
245+
menu[0].secondaryMenu = config.HEADER_MENU[1].secondaryMenu;
246+
}
246247

247248
return {
248249
id: menuProps.id,

src/shared/utils/contentful.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ export function menuItemBuilder(baseUrl, item) {
9494
case 'route':
9595
return {
9696
title: item.fields.naviMenuLinkText || item.fields.name,
97-
href: target(baseUrl, item),
97+
href: item.fields.viewport ? target(baseUrl, item) : null,
9898
id: item.sys.id,
9999
};
100100
case 'navigationMenuItem':
101101
return {
102102
title: item.fields.linkText || item.fields.name,
103-
href: target(baseUrl, item),
103+
href: item.fields.viewport ? target(baseUrl, item) : null,
104104
id: item.sys.id,
105105
};
106106
default: return {};

0 commit comments

Comments
 (0)