diff --git a/frontend/__tests__/components/utils/page-heading.spec.tsx b/frontend/__tests__/components/utils/page-heading.spec.tsx index 1cd58360c22..82738c23800 100644 --- a/frontend/__tests__/components/utils/page-heading.spec.tsx +++ b/frontend/__tests__/components/utils/page-heading.spec.tsx @@ -20,7 +20,7 @@ describe(BreadCrumbs.displayName, () => { it('renders each given breadcrumb', () => { const links: ShallowWrapper = wrapper.find(Link); - const nonLink: ShallowWrapper = wrapper.find('li.active'); + const nonLink: ShallowWrapper = wrapper.findWhere(BreadcrumbItem => BreadcrumbItem.props().isActive === true); expect(links.length + nonLink.length).toEqual(breadcrumbs.length); @@ -29,7 +29,7 @@ describe(BreadCrumbs.displayName, () => { expect(links.at(i).props().to).toEqual(crumb.path); expect(links.at(i).childAt(0).text()).toEqual(crumb.name); } else { - expect(nonLink.text()).toEqual(crumb.name); + expect(nonLink.render().text()).toEqual(crumb.name); } }); }); diff --git a/frontend/public/components/sidebars/explore-type-sidebar.tsx b/frontend/public/components/sidebars/explore-type-sidebar.tsx index 5b22d9aaaa2..8b102f32e6d 100644 --- a/frontend/public/components/sidebars/explore-type-sidebar.tsx +++ b/frontend/public/components/sidebars/explore-type-sidebar.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import * as _ from 'lodash-es'; -import * as classNames from 'classnames'; +import { Breadcrumb, BreadcrumbItem } from '@patternfly/react-core'; import { getDefinitionKey, getStoredSwagger, K8sKind, SwaggerDefinition, SwaggerDefinitions } from '../../module/k8s'; import { ResourceSidebarWrapper, sidebarScrollTop } from './resource-sidebar'; @@ -78,16 +78,16 @@ export const ExploreType: React.FC = (props) => { return ( -
    + {breadcrumbs.map((crumb, i) => { const isLast = i === breadcrumbs.length - 1; - return
  1. + return {isLast ? crumb : } -
  2. ; + ; })} -
+ {description &&

{description}

} {_.isEmpty(currentDefinition.properties) ? diff --git a/frontend/public/components/utils/headings.tsx b/frontend/public/components/utils/headings.tsx index 157657a2302..e4bce7fc7b2 100644 --- a/frontend/public/components/utils/headings.tsx +++ b/frontend/public/components/utils/headings.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import * as classNames from 'classnames'; import * as _ from 'lodash-es'; import { Link } from 'react-router-dom'; -import { Button, SplitItem, Split } from '@patternfly/react-core'; +import { Breadcrumb, BreadcrumbItem, Button, SplitItem, Split } from '@patternfly/react-core'; import { ActionsMenu, ResourceIcon, KebabAction, resourcePath, FirehoseResult, KebabOption } from './index'; import { ClusterServiceVersionLogo } from '../operator-lifecycle-manager'; import { connectToModel } from '../../kinds'; @@ -16,23 +16,23 @@ import { import { ResourceItemDeleting } from '../overview/project-overview'; export const BreadCrumbs: React.SFC = ({ breadcrumbs }) => ( -
    + {breadcrumbs.map((crumb, i, { length }) => { const isLast = i === length - 1; + return ( -
  1. + {isLast ? ( crumb.name ) : ( - + {crumb.name} )} -
  2. + ); })} -
-); + ); const ActionButtons: React.SFC = ({actionButtons}) =>
{_.map(actionButtons, (actionButton, i) => { diff --git a/frontend/public/style/_overrides.scss b/frontend/public/style/_overrides.scss index 479942685a7..ec9cb95bf78 100644 --- a/frontend/public/style/_overrides.scss +++ b/frontend/public/style/_overrides.scss @@ -1,17 +1,6 @@ // Use this file to override styles from 3rd party dependencies $pf-4-nav-bar-height: 76px; // Height of the PatternFly 4 masthead -.breadcrumb { - margin-bottom: 0; - padding-bottom: 12px; - padding-top: 25px; - > li + li:before { - @include font-awesome-free-solid; - content: fa-content($fa-var-angle-right); - font-size: 12px; - } -} - // account for collapsing space between .btn .btn + .btn { margin-left: 3px; @@ -121,6 +110,11 @@ h6 { padding-right: 0; } +.pf-c-breadcrumb { + padding-bottom: 12px; + padding-top: 25px; +} + .pf-c-button--align-right { margin-left: auto !important; } diff --git a/frontend/public/vendor.scss b/frontend/public/vendor.scss index 57a52e0ef15..7c5fc2f7ce6 100644 --- a/frontend/public/vendor.scss +++ b/frontend/public/vendor.scss @@ -20,7 +20,6 @@ @import "~bootstrap-sass/assets/stylesheets/bootstrap/component-animations"; @import "~bootstrap-sass/assets/stylesheets/bootstrap/button-groups"; @import "~bootstrap-sass/assets/stylesheets/bootstrap/input-groups"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs"; @import "~bootstrap-sass/assets/stylesheets/bootstrap/labels"; @import "~bootstrap-sass/assets/stylesheets/bootstrap/list-group"; @import "~bootstrap-sass/assets/stylesheets/bootstrap/close"; @@ -33,7 +32,6 @@ @import "~patternfly/dist/sass/patternfly/mixins"; // Including this file breaks sourcemaps @import '~patternfly/dist/sass/patternfly/buttons'; @import '~patternfly/dist/sass/patternfly/dropdowns'; // required by @patternfly/react-console -@import '~patternfly/dist/sass/patternfly/breadcrumbs'; @import '~patternfly/dist/sass/patternfly/modals'; @import '~patternfly/dist/sass/patternfly/toolbar'; @import '~patternfly/dist/sass/patternfly/list-view';