Skip to content

Commit d8ae9a6

Browse files
[7.x] [APM] Disable auto-refresh by default (#74068) (#74077)
Co-authored-by: Dario Gieselaar <dario.gieselaar@elastic.co>
1 parent 1aad193 commit d8ae9a6

File tree

2 files changed

+11
-28
lines changed

2 files changed

+11
-28
lines changed

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,35 +64,33 @@ describe('DatePicker', () => {
6464
});
6565

6666
beforeEach(() => {
67-
jest.clearAllMocks();
67+
jest.resetAllMocks();
6868
});
6969

70-
it('should set default query params in the URL', () => {
70+
it('sets default query params in the URL', () => {
7171
mountDatePicker();
7272
expect(mockHistoryPush).toHaveBeenCalledTimes(1);
7373
expect(mockHistoryPush).toHaveBeenCalledWith(
7474
expect.objectContaining({
75-
search:
76-
'rangeFrom=now-15m&rangeTo=now&refreshPaused=false&refreshInterval=10000',
75+
search: 'rangeFrom=now-15m&rangeTo=now',
7776
})
7877
);
7978
});
8079

81-
it('should add missing default value', () => {
80+
it('adds missing default value', () => {
8281
mountDatePicker({
8382
rangeTo: 'now',
8483
refreshInterval: 5000,
8584
});
8685
expect(mockHistoryPush).toHaveBeenCalledTimes(1);
8786
expect(mockHistoryPush).toHaveBeenCalledWith(
8887
expect.objectContaining({
89-
search:
90-
'rangeFrom=now-15m&rangeTo=now&refreshInterval=5000&refreshPaused=false',
88+
search: 'rangeFrom=now-15m&rangeTo=now&refreshInterval=5000',
9189
})
9290
);
9391
});
9492

95-
it('should not set default query params in the URL when values already defined', () => {
93+
it('does not set default query params in the URL when values already defined', () => {
9694
mountDatePicker({
9795
rangeFrom: 'now-1d',
9896
rangeTo: 'now',
@@ -102,7 +100,7 @@ describe('DatePicker', () => {
102100
expect(mockHistoryPush).toHaveBeenCalledTimes(0);
103101
});
104102

105-
it('should update the URL when the date range changes', () => {
103+
it('updates the URL when the date range changes', () => {
106104
const datePicker = mountDatePicker();
107105
datePicker.find(EuiSuperDatePicker).props().onTimeChange({
108106
start: 'updated-start',
@@ -113,13 +111,12 @@ describe('DatePicker', () => {
113111
expect(mockHistoryPush).toHaveBeenCalledTimes(2);
114112
expect(mockHistoryPush).toHaveBeenLastCalledWith(
115113
expect.objectContaining({
116-
search:
117-
'rangeFrom=updated-start&rangeTo=updated-end&refreshInterval=5000&refreshPaused=false',
114+
search: 'rangeFrom=updated-start&rangeTo=updated-end',
118115
})
119116
);
120117
});
121118

122-
it('should auto-refresh when refreshPaused is false', async () => {
119+
it('enables auto-refresh when refreshPaused is false', async () => {
123120
jest.useFakeTimers();
124121
const wrapper = mountDatePicker({
125122
refreshPaused: false,
@@ -132,7 +129,7 @@ describe('DatePicker', () => {
132129
wrapper.unmount();
133130
});
134131

135-
it('should NOT auto-refresh when refreshPaused is true', async () => {
132+
it('disables auto-refresh when refreshPaused is true', async () => {
136133
jest.useFakeTimers();
137134
mountDatePicker({ refreshPaused: true, refreshInterval: 1000 });
138135
expect(mockRefreshTimeRange).not.toHaveBeenCalled();

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ import { useUrlParams } from '../../../hooks/useUrlParams';
1414
import { clearCache } from '../../../services/rest/callApi';
1515
import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
1616
import { UI_SETTINGS } from '../../../../../../../src/plugins/data/common';
17-
import {
18-
TimePickerQuickRange,
19-
TimePickerTimeDefaults,
20-
TimePickerRefreshInterval,
21-
} from './typings';
17+
import { TimePickerQuickRange, TimePickerTimeDefaults } from './typings';
2218

2319
function removeUndefinedAndEmptyProps<T extends object>(obj: T): Partial<T> {
2420
return pickBy(obj, (value) => value !== undefined && !isEmpty(String(value)));
@@ -36,19 +32,9 @@ export function DatePicker() {
3632
UI_SETTINGS.TIMEPICKER_TIME_DEFAULTS
3733
);
3834

39-
const timePickerRefreshIntervalDefaults = core.uiSettings.get<
40-
TimePickerRefreshInterval
41-
>(UI_SETTINGS.TIMEPICKER_REFRESH_INTERVAL_DEFAULTS);
42-
4335
const DEFAULT_VALUES = {
4436
rangeFrom: timePickerTimeDefaults.from,
4537
rangeTo: timePickerTimeDefaults.to,
46-
refreshPaused: timePickerRefreshIntervalDefaults.pause,
47-
/*
48-
* Must be replaced by timePickerRefreshIntervalDefaults.value when this issue is fixed.
49-
* https://github.com/elastic/kibana/issues/70562
50-
*/
51-
refreshInterval: 10000,
5238
};
5339

5440
const commonlyUsedRanges = timePickerQuickRanges.map(

0 commit comments

Comments
 (0)