maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[APM] User can't navigate back home using browser nav when clicking link (#75755)

Browse source 
* replaces the route when parmeter is missing

* fixing unit test
This commit is contained in:
Cauê Marcondes 2020-08-25 08:03:22 +01:00 committed by GitHub
parent e31a0c27e6
commit b82e4d8a84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
x-pack/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx
View file

@ -20,6 +20,7 @@ import { wait } from '@testing-library/react';
import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
const mockHistoryPush = jest.spyOn(history, 'push');
const mockHistoryReplace = jest.spyOn(history, 'replace');
const mockRefreshTimeRange = jest.fn();
function MockUrlParamsProvider({
params = {},
@ -69,8 +70,8 @@ describe('DatePicker', () => {
it('sets default query params in the URL', () => {
mountDatePicker();
expect(mockHistoryPush).toHaveBeenCalledTimes(1);
expect(mockHistoryPush).toHaveBeenCalledWith(
expect(mockHistoryReplace).toHaveBeenCalledTimes(1);
expect(mockHistoryReplace).toHaveBeenCalledWith(
expect.objectContaining({
search: 'rangeFrom=now-15m&rangeTo=now',
})
@ -82,8 +83,8 @@ describe('DatePicker', () => {
rangeTo: 'now',
refreshInterval: 5000,
});
expect(mockHistoryPush).toHaveBeenCalledTimes(1);
expect(mockHistoryPush).toHaveBeenCalledWith(
expect(mockHistoryReplace).toHaveBeenCalledTimes(1);
expect(mockHistoryReplace).toHaveBeenCalledWith(
expect.objectContaining({
search: 'rangeFrom=now-15m&rangeTo=now&refreshInterval=5000',
})
@ -97,18 +98,19 @@ describe('DatePicker', () => {
refreshPaused: false,
refreshInterval: 5000,
});
expect(mockHistoryPush).toHaveBeenCalledTimes(0);
expect(mockHistoryReplace).toHaveBeenCalledTimes(0);
});
it('updates the URL when the date range changes', () => {
const datePicker = mountDatePicker();
expect(mockHistoryReplace).toHaveBeenCalledTimes(1);
datePicker.find(EuiSuperDatePicker).props().onTimeChange({
start: 'updated-start',
end: 'updated-end',
isInvalid: false,
isQuickSelection: true,
});
expect(mockHistoryPush).toHaveBeenCalledTimes(2);
expect(mockHistoryPush).toHaveBeenCalledTimes(1);
expect(mockHistoryPush).toHaveBeenLastCalledWith(
expect.objectContaining({
search: 'rangeFrom=updated-start&rangeTo=updated-end',

9
x-pack/plugins/apm/public/components/shared/DatePicker/index.tsx
View file

@ -89,7 +89,14 @@ export function DatePicker() {
...timePickerURLParams,
};
if (!isEqual(nextParams, timePickerURLParams)) {
updateUrl(nextParams);
// When the default parameters are not availbale in the url, replace it adding the necessary parameters.
history.replace({
...location,
search: fromQuery({
...toQuery(location.search),
...nextParams,
}),
});
}
return (