Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Solution nav] Prevent href click on accordion button #183508

Merged
merged 3 commits into from
May 16, 2024
Merged

[Solution nav] Prevent href click on accordion button #183508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef841a9
Prevent href click on accordion button
sebelga May 15, 2024
58ff06f
Merge branch 'main' into solution-sidenav/link-breadcrumb-accordion
sebelga May 15, 2024
21fb442
Merge branch 'main' into solution-sidenav/link-breadcrumb-accordion
sebelga May 16, 2024
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
58 changes: 57 additions & 1 deletion packages/shared-ux/chrome/navigation/__jest__/build_nav_tree.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
*/
import './setup_jest_mocks';
import { of } from 'rxjs';
import type { NavigationTreeDefinitionUI } from '@kbn/core-chrome-browser';
import type {
NavigationTreeDefinitionUI,
ChromeProjectNavigationNode,
} from '@kbn/core-chrome-browser';

import { renderNavigation } from './utils';

Expand Down Expand Up @@ -79,6 +82,59 @@ describe('builds navigation tree', () => {
expect(await findByTestId(/nav-item-group1.group1A.group1A_1.item1/)).toBeVisible();
});

test('should handle links on accordion toggle button', async () => {
const navigateToUrl = jest.fn();

const accordionNode: ChromeProjectNavigationNode = {
id: 'group1',
title: 'Group 1',
path: 'group1',
renderAs: 'accordion',
href: '/app/foo', // Accordion has an href
children: [
{
id: 'item1',
title: 'Item 1',
href: 'https://foo',
path: 'group1.item1',
},
],
};

{
const { findByTestId, unmount } = renderNavigation({
navTreeDef: of({
body: [accordionNode],
}),
services: { navigateToUrl },
});

const accordionToggleButton = await findByTestId(/nav-item-group1\s/);
accordionToggleButton.click();
expect(navigateToUrl).not.toHaveBeenCalled();
unmount();
}

{
const { findByTestId } = renderNavigation({
navTreeDef: of({
body: [
{
...accordionNode,
isCollapsible: false, // Non-collapsible accordion
},
],
}),
services: { navigateToUrl },
});

const accordionToggleButton = await findByTestId(/nav-item-group1\s/);
accordionToggleButton.click();

expect(navigateToUrl).toHaveBeenCalledWith('/app/foo'); // Should navigate to the href
}
});

test('should not render the group if it does not have children', async () => {
const navTree: NavigationTreeDefinitionUI = {
body: [
Expand Down
5 changes: 4 additions & 1 deletion packages/shared-ux/chrome/navigation/src/ui/components/navigation_section_ui.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ const nodeToEuiCollapsibleNavProps = (
const { navNode, isItem, hasChildren, hasLink } = serializeNavNode(_navNode);
const isActive = isActiveFromUrl(navNode.path, activeNodes);

const { id, path, href, renderAs } = navNode;
const { id, path, href, renderAs, isCollapsible = DEFAULT_IS_COLLAPSIBLE } = navNode;
const isExternal = Boolean(href) && !navNode.isElasticInternalLink && isAbsoluteLink(href!);

const isAccordion = hasChildren && !isItem;
Expand Down Expand Up @@ -222,6 +222,9 @@ const nodeToEuiCollapsibleNavProps = (
}

const onClick = (e: React.MouseEvent) => {
// Do not navigate if it is a collapsible accordion, link will be used in the breadcrumb
if (isAccordion && isCollapsible) return;

if (href !== undefined) {
e.preventDefault();
navigateToUrl(href);
Expand Down