Skip to content

Commit e826efb

Browse files
[chore] Clean up shared-ux RedirectAppLinks wrappers (#241017)
## Summary Follow up to #216194 ## Testing Visually check that all the pages where the wrapper is removed look good, since we're removing div with flex styles --------- Co-authored-by: kibanamachine <[email protected]>
1 parent 5895a42 commit e826efb

File tree

38 files changed

+553
-991
lines changed

38 files changed

+553
-991
lines changed

examples/content_management_examples/public/examples/index.tsx

Lines changed: 54 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import React from 'react';
1111
import ReactDOM from 'react-dom';
1212
import { Redirect } from 'react-router-dom';
1313
import { Router, Routes, Route } from '@kbn/shared-ux-router';
14-
import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app';
1514
import { EuiPageTemplate, EuiSideNav } from '@elastic/eui';
1615
import type { AppMountParameters, CoreStart } from '@kbn/core/public';
1716
import type { StartDeps } from '../types';
@@ -27,63 +26,61 @@ export const renderApp = (
2726
ReactDOM.render(
2827
core.rendering.addContext(
2928
<Router history={history}>
30-
<RedirectAppLinks coreStart={core}>
31-
<EuiPageTemplate offset={0}>
32-
<EuiPageTemplate.Sidebar>
33-
<EuiSideNav
34-
items={[
35-
{
36-
id: 'Examples',
37-
name: 'Examples',
38-
items: [
39-
{
40-
id: 'todos',
41-
name: 'Todo app',
42-
'data-test-subj': 'todosExample',
43-
href: '/app/contentManagementExamples/todos',
44-
},
45-
{
46-
id: 'msearch',
47-
name: 'MSearch',
48-
'data-test-subj': 'msearchExample',
49-
href: '/app/contentManagementExamples/msearch',
50-
},
51-
{
52-
id: 'finder',
53-
name: 'Finder',
54-
'data-test-subj': 'finderExample',
55-
href: '/app/contentManagementExamples/finder',
56-
},
57-
],
58-
},
59-
]}
60-
/>
61-
</EuiPageTemplate.Sidebar>
29+
<EuiPageTemplate offset={0}>
30+
<EuiPageTemplate.Sidebar>
31+
<EuiSideNav
32+
items={[
33+
{
34+
id: 'Examples',
35+
name: 'Examples',
36+
items: [
37+
{
38+
id: 'todos',
39+
name: 'Todo app',
40+
'data-test-subj': 'todosExample',
41+
href: '/app/contentManagementExamples/todos',
42+
},
43+
{
44+
id: 'msearch',
45+
name: 'MSearch',
46+
'data-test-subj': 'msearchExample',
47+
href: '/app/contentManagementExamples/msearch',
48+
},
49+
{
50+
id: 'finder',
51+
name: 'Finder',
52+
'data-test-subj': 'finderExample',
53+
href: '/app/contentManagementExamples/finder',
54+
},
55+
],
56+
},
57+
]}
58+
/>
59+
</EuiPageTemplate.Sidebar>
6260

63-
<EuiPageTemplate.Section>
64-
<Routes>
65-
<Redirect from="/" to="/todos" exact />
66-
<Route path="/todos">
67-
<TodoApp contentClient={contentManagement.client} />
68-
</Route>
69-
<Route path="/msearch">
70-
<MSearchApp
71-
contentClient={contentManagement.client}
72-
core={core}
73-
savedObjectsTagging={savedObjectsTaggingOss}
74-
/>
75-
</Route>
76-
<Route path="/finder">
77-
<FinderApp
78-
contentClient={contentManagement.client}
79-
core={core}
80-
savedObjectsTagging={savedObjectsTaggingOss}
81-
/>
82-
</Route>
83-
</Routes>
84-
</EuiPageTemplate.Section>
85-
</EuiPageTemplate>
86-
</RedirectAppLinks>
61+
<EuiPageTemplate.Section>
62+
<Routes>
63+
<Redirect from="/" to="/todos" exact />
64+
<Route path="/todos">
65+
<TodoApp contentClient={contentManagement.client} />
66+
</Route>
67+
<Route path="/msearch">
68+
<MSearchApp
69+
contentClient={contentManagement.client}
70+
core={core}
71+
savedObjectsTagging={savedObjectsTaggingOss}
72+
/>
73+
</Route>
74+
<Route path="/finder">
75+
<FinderApp
76+
contentClient={contentManagement.client}
77+
core={core}
78+
savedObjectsTagging={savedObjectsTaggingOss}
79+
/>
80+
</Route>
81+
</Routes>
82+
</EuiPageTemplate.Section>
83+
</EuiPageTemplate>
8784
</Router>
8885
),
8986
element

examples/content_management_examples/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
"@kbn/core",
1919
"@kbn/developer-examples-plugin",
2020
"@kbn/content-management-plugin",
21-
"@kbn/shared-ux-link-redirect-app",
2221
"@kbn/content-management-table-list-view",
2322
"@kbn/content-management-table-list-view-table",
2423
"@kbn/i18n-react",

src/core/packages/chrome/browser-internal/src/ui/header/__snapshots__/header.test.tsx.snap

Lines changed: 19 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/packages/chrome/browser-internal/src/ui/header/header.tsx

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ import type {
3535
} from '@kbn/core-chrome-browser';
3636
import type { CustomBranding } from '@kbn/core-custom-branding-common';
3737
import type { DocLinksStart } from '@kbn/core-doc-links-browser';
38-
import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app';
39-
import { css } from '@emotion/react';
4038
import { CollapsibleNav } from './collapsible_nav';
4139
import { HeaderBadge } from './header_badge';
4240
import { HeaderBreadcrumbs } from './header_breadcrumbs';
@@ -199,18 +197,12 @@ export function Header({
199197

200198
<HeaderNavControls side="left" navControls$={observables.navControlsLeft$} />
201199
</EuiHeaderSection>
202-
<RedirectAppLinks
203-
coreStart={{ application }}
204-
css={css`
205-
min-width: 0; // enable text truncation for long breadcrumb titles
206-
`}
200+
201+
<BreadcrumbsWithExtensionsWrapper
202+
breadcrumbsAppendExtensions$={breadcrumbsAppendExtensions$}
207203
>
208-
<BreadcrumbsWithExtensionsWrapper
209-
breadcrumbsAppendExtensions$={breadcrumbsAppendExtensions$}
210-
>
211-
{Breadcrumbs}
212-
</BreadcrumbsWithExtensionsWrapper>
213-
</RedirectAppLinks>
204+
{Breadcrumbs}
205+
</BreadcrumbsWithExtensionsWrapper>
214206

215207
<HeaderBadge badge$={observables.badge$} />
216208

src/core/packages/chrome/browser-internal/src/ui/project/header.tsx

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import type { DocLinksStart } from '@kbn/core-doc-links-browser';
3232
import type { HttpStart } from '@kbn/core-http-browser';
3333
import type { MountPoint } from '@kbn/core-mount-utils-browser';
3434
import { i18n } from '@kbn/i18n';
35-
import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app';
3635
import React, { type ComponentProps, useCallback } from 'react';
3736
import useObservable from 'react-use/lib/useObservable';
3837
import type { Observable } from 'rxjs';
@@ -74,9 +73,6 @@ const getHeaderCss = ({ size, colors }: EuiThemeComputed) => ({
7473
breadcrumbsSectionItem: css`
7574
min-width: 0; // needed to enable breadcrumbs truncation
7675
`,
77-
redirectAppLinksContainer: css`
78-
min-width: 0; // needed to enable breadcrumbs truncation
79-
`,
8076
leftNavcontrols: css`
8177
.navcontrols__separator {
8278
display: flex;
@@ -276,16 +272,11 @@ export const ProjectHeader = ({
276272
</EuiHeaderSectionItem>
277273

278274
<EuiHeaderSectionItem css={headerCss.breadcrumbsSectionItem}>
279-
<RedirectAppLinks
280-
coreStart={{ application }}
281-
css={headerCss.redirectAppLinksContainer}
275+
<BreadcrumbsWithExtensionsWrapper
276+
breadcrumbsAppendExtensions$={breadcrumbsAppendExtensions$}
282277
>
283-
<BreadcrumbsWithExtensionsWrapper
284-
breadcrumbsAppendExtensions$={breadcrumbsAppendExtensions$}
285-
>
286-
<Breadcrumbs breadcrumbs$={observables.breadcrumbs$} />
287-
</BreadcrumbsWithExtensionsWrapper>
288-
</RedirectAppLinks>
278+
<Breadcrumbs breadcrumbs$={observables.breadcrumbs$} />
279+
</BreadcrumbsWithExtensionsWrapper>
289280
</EuiHeaderSectionItem>
290281
</EuiHeaderSection>
291282

src/core/packages/chrome/browser-internal/src/ui/project/sidenav_v2/navigation/navigation.tsx

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import type { ApplicationStart } from '@kbn/core-application-browser';
2323
import type { NavigationTourManager } from '@kbn/core-chrome-navigation-tour';
2424
import { NavigationTour } from '@kbn/core-chrome-navigation-tour';
2525
import useObservable from 'react-use/lib/useObservable';
26-
import { RedirectNavigationAppLinks } from './redirect_app_links';
2726
import type { NavigationItems } from './to_navigation_items';
2827
import { toNavigationItems } from './to_navigation_items';
2928
import { PanelStateManager } from './panel_state_manager';
@@ -76,22 +75,20 @@ export const Navigation = (props: ChromeNavigationProps) => {
7675
props.isCollapsed ? 'collapsed' : 'expanded'
7776
}
7877
/>
79-
<RedirectNavigationAppLinks application={props.application}>
80-
<NavigationComponent
81-
items={navItems}
82-
logo={logoItem}
83-
sidePanelFooter={
84-
<NavigationFeedbackSnippet
85-
solutionId={solutionId}
86-
feedbackUrlParams={feedbackUrlParams}
87-
/>
88-
}
89-
isCollapsed={props.isCollapsed}
90-
setWidth={props.setWidth}
91-
activeItemId={activeItemId}
92-
data-test-subj={classnames(dataTestSubj, 'projectSideNav', 'projectSideNavV2')}
93-
/>
94-
</RedirectNavigationAppLinks>
78+
<NavigationComponent
79+
items={navItems}
80+
logo={logoItem}
81+
sidePanelFooter={
82+
<NavigationFeedbackSnippet
83+
solutionId={solutionId}
84+
feedbackUrlParams={feedbackUrlParams}
85+
/>
86+
}
87+
isCollapsed={props.isCollapsed}
88+
setWidth={props.setWidth}
89+
activeItemId={activeItemId}
90+
data-test-subj={classnames(dataTestSubj, 'projectSideNav', 'projectSideNavV2')}
91+
/>
9592
</>
9693
);
9794
};

src/core/packages/chrome/browser-internal/src/ui/project/sidenav_v2/navigation/redirect_app_links.tsx

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/core/packages/chrome/browser-internal/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"@kbn/default-nav-management",
4747
"@kbn/default-nav-devtools",
4848
"@kbn/shared-ux-router",
49-
"@kbn/shared-ux-link-redirect-app",
5049
"@kbn/core-http-browser-internal",
5150
"@kbn/core-base-browser-internal",
5251
"@kbn/core-base-browser-mocks",

0 commit comments

Comments
 (0)