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>
54 lines
1.7 KiB
TypeScript
54 lines
1.7 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; you may not use this file except in compliance with the Elastic License
|
|
* 2.0.
|
|
*/
|
|
|
|
import React, { FC } from 'react';
|
|
import { Router, Switch, RouteComponentProps, Redirect } from 'react-router-dom';
|
|
import { Route } from '@kbn/shared-ux-router';
|
|
import { History } from 'history';
|
|
import { parse, stringify } from 'query-string';
|
|
import { HomeRoute } from './home';
|
|
import { WorkpadRoute, ExportWorkpadRoute } from './workpad';
|
|
|
|
const isHashPath = (hash: string) => {
|
|
return hash.indexOf('#/') === 0;
|
|
};
|
|
|
|
const mergeQueryStrings = (query: string, queryFromHash: string) => {
|
|
const queryObject = parse(query);
|
|
const hashObject = parse(queryFromHash);
|
|
|
|
return stringify({ ...queryObject, ...hashObject });
|
|
};
|
|
|
|
export const CanvasRouter: FC<{ history: History }> = ({ history }) => (
|
|
<Router history={history}>
|
|
<Route
|
|
path="/"
|
|
children={(route: RouteComponentProps) => {
|
|
// If it looks like the hash is a route then we will do a redirect
|
|
if (isHashPath(route.location.hash)) {
|
|
const [hashPath, hashQuery] = route.location.hash.split('?');
|
|
let search = route.location.search || '?';
|
|
|
|
if (hashQuery !== undefined) {
|
|
search = mergeQueryStrings(search, `?${hashQuery}`);
|
|
}
|
|
|
|
return <Redirect to={`${hashPath.substr(1)}${search.length > 1 ? `?${search}` : ''}`} />;
|
|
}
|
|
|
|
return (
|
|
<Switch>
|
|
{ExportWorkpadRoute()}
|
|
{WorkpadRoute()}
|
|
{HomeRoute()}
|
|
</Switch>
|
|
);
|
|
}}
|
|
/>
|
|
</Router>
|
|
);
|