Skip to content

fix(header navlinks): link navlinks to path prefix #25495

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

Merged
eschutho merged 6 commits into from
Oct 17, 2023
Merged

fix(header navlinks): link navlinks to path prefix #25495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da34ed1
added location tracking to header menu
fisjac Sep 28, 2023
e6bcd50
added missing useRouter: true in single test case
fisjac Oct 4, 2023
a8bb039
aligning package-lock with the latest pull from master
fisjac Oct 6, 2023
9cd28bb
cleaning up initial state
fisjac Oct 12, 2023
61c60cc
fixing TS lint error
fisjac Oct 14, 2023
fed19e3
small renaming change
fisjac Oct 14, 2023
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
6 changes: 5 additions & 1 deletion superset-frontend/src/features/home/Menu.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,11 @@ test('should render the environment tag', async () => {
const {
data: { environment_tag },
} = mockedProps;
render(<Menu {...mockedProps} />, { useRedux: true, useQueryParams: true });
render(<Menu {...mockedProps} />, {
useRedux: true,
useQueryParams: true,
useRouter: true,
});
expect(await screen.findByText(environment_tag.text)).toBeInTheDocument();
});

Expand Down
30 changes: 29 additions & 1 deletion superset-frontend/src/features/home/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { getUrlParam } from 'src/utils/urlUtils';
import { Row, Col, Grid } from 'src/components';
import { MainNav as DropdownMenu, MenuMode } from 'src/components/Menu';
import { Tooltip } from 'src/components/Tooltip';
import { Link } from 'react-router-dom';
import { Link, useLocation } from 'react-router-dom';
import { GenericLink } from 'src/components/GenericLink/GenericLink';
import Icons from 'src/components/Icons';
import { useUiConfig } from 'src/components/UiConfigContext';
Expand Down Expand Up @@ -186,6 +186,33 @@ export function Menu({
return () => window.removeEventListener('resize', windowResize);
}, []);

enum paths {
EXPLORE = '/explore',
DASHBOARD = '/dashboard',
CHART = '/chart',
DATASETS = '/tablemodelview',
}

const defaultTabSelection: string[] = [];
const [activeTabs, setActiveTabs] = useState(defaultTabSelection);
const location = useLocation();
useEffect(() => {
const path = location.pathname;
switch (true) {
case path.startsWith(paths.DASHBOARD):
setActiveTabs(['Dashboards']);
break;
case path.startsWith(paths.CHART) || path.startsWith(paths.EXPLORE):
setActiveTabs(['Charts']);
break;
case path.startsWith(paths.DATASETS):
setActiveTabs(['Datasets']);
break;
default:
setActiveTabs(defaultTabSelection);
}
}, [location.pathname]);

const standalone = getUrlParam(URL_PARAMS.standalone);
if (standalone || uiConfig.hideNav) return <></>;

Expand Down Expand Up @@ -268,6 +295,7 @@ export function Menu({
mode={showMenu}
data-test="navbar-top"
className="main-nav"
selectedKeys={activeTabs}
>
{menu.map((item, index) => {
const props = {
Expand Down