Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Endpoint] add react router to endpoint app #53808

Merged
merged 12 commits into from
Jan 2, 2020
Merged

[Endpoint] add react router to endpoint app #53808

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dad6c7e
add react router to endpoint app
kevinlog Dec 26, 2019
3a43db7
linting
kevinlog Dec 26, 2019
e76c7e0
linting
kevinlog Dec 26, 2019
9561018
linting
kevinlog Dec 26, 2019
1349fd0
correct tests
kevinlog Dec 27, 2019
7317dd0
change history from hash to browser, add new test util
kevinlog Dec 27, 2019
eff2be6
remove default values in helper functions
kevinlog Dec 27, 2019
1d5221e
fix type check, use FunctionComponent as oppsed to FC
kevinlog Dec 27, 2019
3044cf2
Merge branch 'master' into add-router-to-endpoint-app
elasticmachine Jan 2, 2020
83ca184
use BrowserRouter component
kevinlog Jan 2, 2020
899b9cf
use BrowserRouter component lin
kevinlog Jan 2, 2020
88aeb48
add comments to test framework, change function name to include brows…
kevinlog Jan 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions x-pack/plugins/endpoint/public/applications/endpoint/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,43 @@ import * as React from 'react';
import ReactDOM from 'react-dom';
import { CoreStart, AppMountParameters } from 'kibana/public';
import { I18nProvider, FormattedMessage } from '@kbn/i18n/react';
import { History, createHashHistory } from 'history';
import { Route, Router, Switch } from 'react-router-dom';

/**
* This module will be loaded asynchronously to reduce the bundle size of your plugin's main bundle.
*/
export function renderApp(coreStart: CoreStart, { element }: AppMountParameters) {
coreStart.http.get('/api/endpoint/hello-world');

ReactDOM.render(<AppRoot />, element);
const history = createHashHistory()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kibana testing utils all seem to use hash history (see test below), doesn't mean we have to

ReactDOM.render(<AppRoot history={history}/>, element);

return () => {
ReactDOM.unmountComponentAtNode(element);
};
}

const AppRoot = React.memo(() => (
interface RouterProps {
history: History;
}

const AppRoot: React.FC<RouterProps> = React.memo(({history}) => (
<I18nProvider>
<h1 data-test-subj="welcomeTitle">
<FormattedMessage id="xpack.endpoint.welcomeTitle" defaultMessage="Hello World" />
</h1>
<Router history={history}>
<Switch>
<Route exact path="/" render={() => (
<h1 data-test-subj="welcomeTitle">
<FormattedMessage id="xpack.endpoint.welcomeTitle" defaultMessage="Hello World" />
</h1>
)} />
<Route path="/management" render={() => (
<h1 data-test-subj="management ">
<FormattedMessage id="xpack.endpoint.management" defaultMessage="Manage Endpoints" />
</h1>
)} />
<Route render={() => <FormattedMessage id="xpack.endpoint.notFound" defaultMessage="Page Not Found" />} />
</Switch>
</Router>
</I18nProvider>
));
9 changes: 9 additions & 0 deletions x-pack/test/functional/apps/endpoint/feature_controls/endpoint_spaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
});
await testSubjects.existOrFail('welcomeTitle');
});

it(`endpoint management shows 'Manage Endpoints'`, async () => {
await pageObjects.common.navigateToActualUrl('endpoint', '/management', {
basePath: '/s/custom_space',
ensureCurrentUrl: false,
shouldLoginIfPrompted: false,
});
await testSubjects.existOrFail('management');
});
});

describe('space with endpoint disabled', () => {
Expand Down