External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 03:10:42 -03:30
Code Issues Packages Projects Releases Wiki Activity

Removes withRouter from breadcrumbs in favor of hooks

Browse Source
This commit is contained in:
mabashian 2020-04-08 09:47:23 -04:00
parent 7feac5ecd6
commit f734918d3e
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
awx/ui_next/src/components/Breadcrumbs/Breadcrumbs.jsx
View File

@ -7,7 +7,7 @@ import {
BreadcrumbItem,
BreadcrumbHeading,
} from '@patternfly/react-core';
import { Link, Route, withRouter, useRouteMatch } from 'react-router-dom';
import { Link, Route, useRouteMatch } from 'react-router-dom';
import styled from 'styled-components';
@ -16,21 +16,22 @@ const PageSection = styled(PFPageSection)`
padding-bottom: 10px;
`;
const Breadcrumbs = ({ breadcrumbConfig, match }) => {
const Breadcrumbs = ({ breadcrumbConfig }) => {
const { light } = PageSectionVariants;
return (
<PageSection variant={light}>
<Breadcrumb>
<Route path="/:path">
<Crumb breadcrumbConfig={breadcrumbConfig} match={match} />
<Crumb breadcrumbConfig={breadcrumbConfig} />
</Route>
</Breadcrumb>
</PageSection>
);
};
const Crumb = ({ breadcrumbConfig, match }) => {
const Crumb = ({ breadcrumbConfig }) => {
const match = useRouteMatch();
const crumb = breadcrumbConfig[match.url];
let crumbElement = (
@ -49,16 +50,11 @@ const Crumb = ({ breadcrumbConfig, match }) => {
crumbElement = null;
}
function NextCrumb() {
const routeMatch = useRouteMatch();
return <Crumb breadcrumbConfig={breadcrumbConfig} match={routeMatch} />;
}
return (
<Fragment>
{crumbElement}
<Route path={`${match.url}/:path`}>
<NextCrumb />
<Crumb breadcrumbConfig={breadcrumbConfig} />
</Route>
</Fragment>
);
@ -72,4 +68,4 @@ Crumb.propTypes = {
breadcrumbConfig: PropTypes.objectOf(PropTypes.string).isRequired,
};
export default withRouter(Breadcrumbs);
export default Breadcrumbs;