github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Serverless Sidenav] Order active paths by tree depth (#174184)

Browse source
This commit is contained in:
Sébastien Loix 2024-01-05 11:08:38 +00:00 • committed by GitHub
parent 702b207d2d
commit 42272f90c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

55
packages/core/chrome/core-chrome-browser-internal/src/project_navigation/utils.test.ts
View file

@ -133,33 +133,36 @@ describe('findActiveNodes', () => {
title: 'Root',
path: 'root',
},
// Group 1
'[0][0]': {
id: 'group1',
title: 'Group 1',
deepLink: getDeepLink('group1', 'group1'),
path: 'root.group1',
},
'[0][0][0]': {
id: 'group1A',
title: 'Group 1A',
path: 'root.group1.group1A',
},
'[0][0][0][0]': {
id: 'item1',
title: 'Item 1',
deepLink: getDeepLink('item1', 'item1'),
path: 'root.group1.group1A.item1',
deepLink: getDeepLink('item1', 'item1'), // First match
path: 'root.group1.item1',
},
// Group 2
'[0][1]': {
id: 'group2',
title: 'Group 2',
deepLink: getDeepLink('group2', 'group2'),
path: 'root.group2',
},
'[0][1][0]': {
id: 'group2A',
title: 'Group 2A',
path: 'root.group2.group2A',
},
'[0][1][0][0]': {
id: 'item2',
title: 'Item 2',
deepLink: getDeepLink('item1', 'item1'), // Same link as above, should match both
path: 'root.group2.item2',
// Second match --> should come first as it is the longest match of the 2
deepLink: getDeepLink('item1', 'item1'),
path: 'root.group2.group2A.item2',
},
};
@ -172,21 +175,21 @@ describe('findActiveNodes', () => {
path: 'root',
},
{
id: 'group1',
title: 'Group 1',
deepLink: getDeepLink('group1', 'group1'),
path: 'root.group1',
id: 'group2',
title: 'Group 2',
deepLink: getDeepLink('group2', 'group2'),
path: 'root.group2',
},
{
id: 'group1A',
title: 'Group 1A',
path: 'root.group1.group1A',
id: 'group2A',
title: 'Group 2A',
path: 'root.group2.group2A',
},
{
id: 'item1',
title: 'Item 1',
id: 'item2',
title: 'Item 2',
deepLink: getDeepLink('item1', 'item1'),
path: 'root.group1.group1A.item1',
path: 'root.group2.group2A.item2',
},
],
[
@ -196,15 +199,15 @@ describe('findActiveNodes', () => {
path: 'root',
},
{
id: 'group2',
title: 'Group 2',
path: 'root.group2',
id: 'group1',
title: 'Group 1',
path: 'root.group1',
},
{
id: 'item2',
title: 'Item 2',
id: 'item1',
title: 'Item 1',
deepLink: getDeepLink('item1', 'item1'),
path: 'root.group2.item2',
path: 'root.group1.item1',
},
],
]);

3
packages/core/chrome/core-chrome-browser-internal/src/project_navigation/utils.ts
View file

@ -137,6 +137,9 @@ export const findActiveNodes = (
matches[length] = [];
}
matches[length].push(key);
// If there are multiple node matches of the same URL path length, we want to order them by
// tree depth, so that the longest match (deepest node) comes first.
matches[length].sort((a, b) => b.length - a.length);
}
}
});

2
x-pack/plugins/serverless_observability/public/components/side_navigation/index.tsx
View file

@ -33,8 +33,6 @@ const navigationTree: NavigationTreeDefinition = {
defaultMessage: 'Discover',
}),
link: 'observability-log-explorer',
// prevent this entry from ever becoming active, effectively falling through to the obs-log-explorer child
getIsActive: () => false,
// avoid duplicate "Discover" breadcrumbs
breadcrumbStatus: 'hidden',
renderAs: 'item',