mirror of
https://github.com/grafana/grafana.git
synced 2025-02-12 08:35:43 -06:00
Breadcrumbs: Don't add breadcrumb for the current tab (#68230)
Breadcrumbs: Don't add breadcrumbs for the current tab
This commit is contained in:
parent
43be4f095a
commit
c9ce1a28c3
@ -144,22 +144,5 @@ describe('breadcrumb utils', () => {
|
|||||||
{ text: 'My page', href: '/my-page' },
|
{ text: 'My page', href: '/my-page' },
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Should add breadcrumbs for child pages that have not set parentItem', () => {
|
|
||||||
const pageNav: NavModelItem = {
|
|
||||||
text: 'My page',
|
|
||||||
url: '/my-page',
|
|
||||||
children: [
|
|
||||||
{ text: 'A', url: '/a', active: true },
|
|
||||||
{ text: 'B', url: '/b' },
|
|
||||||
],
|
|
||||||
};
|
|
||||||
|
|
||||||
expect(buildBreadcrumbs(mockHomeNav, pageNav, mockHomeNav)).toEqual([
|
|
||||||
{ text: 'Home', href: '/home' },
|
|
||||||
{ text: 'My page', href: '/my-page' },
|
|
||||||
{ text: 'A', href: '/a' },
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -30,18 +30,7 @@ export function buildBreadcrumbs(sectionNav: NavModelItem, pageNav?: NavModelIte
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (pageNav) {
|
if (pageNav) {
|
||||||
if (pageNav.url && pageNav.children) {
|
addCrumbs(pageNav);
|
||||||
const child = pageNav.children.find((child) => child.active);
|
|
||||||
if (child) {
|
|
||||||
addCrumbs(child);
|
|
||||||
// Some pages set up children but they are not connected to parent pageNav
|
|
||||||
if (child.parentItem !== pageNav) {
|
|
||||||
addCrumbs(pageNav);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
addCrumbs(pageNav);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
addCrumbs(sectionNav);
|
addCrumbs(sectionNav);
|
||||||
|
Loading…
Reference in New Issue
Block a user