mirror of
https://github.com/elastic/kibana.git
synced 2025-06-27 18:51:07 -04:00
## Summary This PR removes all imports of Route from react-router-dom and '@kbn/kibana-react-plugin/public' and instead imports Route from @kbn/shared-ux-router. ### Context Based on https://github.com/elastic/kibana/issues/132629#issue-1243243678 This PR executes steps 2 - 4: > 2. To make the transition easier, we want to re-export other react-router-dom exports alongside the modified' Route'. > 3. Solutions should start using that Route component in place of the one from react-router-dom. I.e. replace all occurrences of import { ... } from 'react-router-dom' with import { ... } from '@kbn/shared-ux-router'. > 4. All manual calls to useExecutionContext are not needed anymore and should be removed. ### Future PR Looks like this might be getting worked on in: https://github.com/elastic/kibana/pull/145863 (thanks!) > Introduce an ESlint rule that ensures that react-router-dom is not used directly in Kibana and that imports go through the new @kbn/shared-ux-router package. This is tangentially accomplished through https://github.com/elastic/kibana/pull/150340 but only addresses using Route through @kbn/kibana-react-plugin/public' ### Checklist Delete any items that are not applicable to this PR. - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Tiago Costa <tiagoffcc@hotmail.com>
79 lines
2.2 KiB
TypeScript
79 lines
2.2 KiB
TypeScript
/*
|
|
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
|
|
* or more contributor license agreements. Licensed under the Elastic License
|
|
* 2.0 and the Server Side Public License, v 1; you may not use this file except
|
|
* in compliance with, at your election, the Elastic License 2.0 or the Server
|
|
* Side Public License, v 1.
|
|
*/
|
|
|
|
import React from 'react';
|
|
import ReactDOM from 'react-dom';
|
|
|
|
import { EuiPageBody } from '@elastic/eui';
|
|
import { EuiPageContent_Deprecated as EuiPageContent } from '@elastic/eui';
|
|
import { EuiPageContentBody_Deprecated as EuiPageContentBody } from '@elastic/eui';
|
|
import { Switch, Redirect, Router, useLocation } from 'react-router-dom';
|
|
import { Route } from '@kbn/shared-ux-router';
|
|
import { createBrowserHistory } from 'history';
|
|
import { EuiText } from '@elastic/eui';
|
|
import { AppMountParameters } from '@kbn/core/public';
|
|
|
|
function useQuery() {
|
|
const { search } = useLocation();
|
|
const params = React.useMemo(() => new URLSearchParams(search), [search]);
|
|
return params;
|
|
}
|
|
|
|
interface HelloPageProps {
|
|
firstName: string;
|
|
lastName: string;
|
|
}
|
|
|
|
const HelloPage = ({ firstName, lastName }: HelloPageProps) => (
|
|
<EuiText>{`Hello ${firstName} ${lastName}`}</EuiText>
|
|
);
|
|
|
|
export const Routes: React.FC<{}> = () => {
|
|
const query = useQuery();
|
|
|
|
return (
|
|
<EuiPageBody>
|
|
<EuiPageContent>
|
|
<EuiPageContentBody>
|
|
<Switch>
|
|
<Route path="/hello">
|
|
<HelloPage
|
|
firstName={query.get('firstName') || ''}
|
|
lastName={query.get('lastName') || ''}
|
|
/>
|
|
</Route>
|
|
<Redirect from="/" to="/hello" />
|
|
</Switch>
|
|
</EuiPageContentBody>
|
|
</EuiPageContent>
|
|
</EuiPageBody>
|
|
);
|
|
};
|
|
|
|
export const LinksExample: React.FC<{
|
|
appBasePath: string;
|
|
}> = (props) => {
|
|
const history = React.useMemo(
|
|
() =>
|
|
createBrowserHistory({
|
|
basename: props.appBasePath,
|
|
}),
|
|
[props.appBasePath]
|
|
);
|
|
return (
|
|
<Router history={history}>
|
|
<Routes />
|
|
</Router>
|
|
);
|
|
};
|
|
|
|
export const renderApp = (props: { appBasePath: string }, { element }: AppMountParameters) => {
|
|
ReactDOM.render(<LinksExample {...props} />, element);
|
|
|
|
return () => ReactDOM.unmountComponentAtNode(element);
|
|
};
|