Skip to content

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

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

Merged
cauemarcondes merged 3 commits into from
Aug 27, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f43b3f
[APM] User can't navigate back home using browser nav when clicking l…
cauemarcondes Aug 25, 2020
e9c31e3
Merge branch '7.9' into backport/7.9/pr-75755
elasticmachine Aug 26, 2020
bfce014
Merge branch '7.9' into backport/7.9/pr-75755
elasticmachine Aug 27, 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
14 changes: 8 additions & 6 deletions x-pack/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
const MockUrlParamsProvider: React.FC<{
params?: IUrlParams;
Expand Down Expand Up @@ -63,8 +64,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',
})
Expand All @@ -76,8 +77,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',
})
Expand All @@ -91,18 +92,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',
Expand Down
9 changes: 8 additions & 1 deletion x-pack/plugins/apm/public/components/shared/DatePicker/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down