From 2004dae81aa22067a6ec8077b904a8e8ccd49858 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 29 Aug 2024 02:06:06 +0000 Subject: [PATCH] [Page Header]consume new breadcrumb components from oui (#7843) (cherry picked from commit 4ff6c6bdd4af32f7bb318cf796f84c6f842f7fc2) Signed-off-by: github-actions[bot] --- .../header/__snapshots__/header.test.tsx.snap | 27 ++++++++------ .../header_breadcrumbs.test.tsx.snap | 11 +----- .../chrome/ui/header/header_breadcrumbs.scss | 35 ------------------- .../ui/header/header_breadcrumbs.test.tsx | 1 - .../chrome/ui/header/header_breadcrumbs.tsx | 4 +-- 5 files changed, 18 insertions(+), 60 deletions(-) delete mode 100644 src/core/public/chrome/ui/header/header_breadcrumbs.scss diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap index 88f06ee9edcb..4d9946809319 100644 --- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap +++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap @@ -4308,9 +4308,9 @@ exports[`Header handles visibility and lock changes 1`] = ` }, ] } - className="" data-test-subj="breadcrumbs" max={10} + simplify={false} > - - + @@ -21814,9 +21819,9 @@ exports[`Header toggles primary navigation menu when clicked 1`] = ` }, ] } - className="" data-test-subj="breadcrumbs" max={10} + simplify={false} > - First - -`; +exports[`HeaderBreadcrumbs renders updates to the breadcrumbs$ observable with updated header 2`] = `null`; exports[`HeaderBreadcrumbs renders updates to the breadcrumbs$ observable with updated header 3`] = `null`; diff --git a/src/core/public/chrome/ui/header/header_breadcrumbs.scss b/src/core/public/chrome/ui/header/header_breadcrumbs.scss deleted file mode 100644 index b3f09e9e8a93..000000000000 --- a/src/core/public/chrome/ui/header/header_breadcrumbs.scss +++ /dev/null @@ -1,35 +0,0 @@ -/* -* Copyright OpenSearch Contributors -* SPDX-License-Identifier: Apache-2.0 -*/ - -.headerBreadcrumbs { - margin-left: 0; - color: $euiColorPrimary; - - .euiBreadcrumbWall { - background-image: none; // Removes any background image - } - - .euiBreadcrumbWrapper { - padding-left: 0; - padding-right: 0; - - &.euiBreadcrumbWrapper--last::after, - &:not(.euiBreadcrumbWrapper--last)::after { - content: "/"; - background-color: transparent; - padding: 0 $euiSizeS; - color: $euiColorMediumShade; - } - - &.euiBreadcrumbWrapper--last::before, - &:not(.euiBreadcrumbWrapper--last)::before { - display: none; - } - } - - .euiBreadcrumb { - color: inherit !important; - } -} diff --git a/src/core/public/chrome/ui/header/header_breadcrumbs.test.tsx b/src/core/public/chrome/ui/header/header_breadcrumbs.test.tsx index 6cc25b392ce3..f01e751e39f0 100644 --- a/src/core/public/chrome/ui/header/header_breadcrumbs.test.tsx +++ b/src/core/public/chrome/ui/header/header_breadcrumbs.test.tsx @@ -67,7 +67,6 @@ describe('HeaderBreadcrumbs', () => { /> ); expect(wrapper.find('.euiBreadcrumb')).toMatchSnapshot(); - expect(wrapper.find('.headerBreadcrumbs').exists()).toBeTruthy(); expect(wrapper.find('[data-test-subj="breadcrumb first"]').exists()).toBeFalsy(); act(() => breadcrumbs$.next([{ text: 'First' }, { text: 'Second' }])); diff --git a/src/core/public/chrome/ui/header/header_breadcrumbs.tsx b/src/core/public/chrome/ui/header/header_breadcrumbs.tsx index 5361db221d10..52c9aa2628e9 100644 --- a/src/core/public/chrome/ui/header/header_breadcrumbs.tsx +++ b/src/core/public/chrome/ui/header/header_breadcrumbs.tsx @@ -34,7 +34,6 @@ import React, { useEffect, useState } from 'react'; import useObservable from 'react-use/lib/useObservable'; import { Observable } from 'rxjs'; import { ChromeBreadcrumb, ChromeBreadcrumbEnricher } from '../../chrome_service'; -import './header_breadcrumbs.scss'; interface Props { appTitle$: Observable; @@ -85,14 +84,13 @@ export function HeaderBreadcrumbs({ })); const remainingCrumbs = useUpdatedHeader ? crumbs.slice(0, -1) : crumbs; - const className = useUpdatedHeader ? 'headerBreadcrumbs' : ''; return ( ); }