[APM] Disable auto-refresh by default (#74068)

elastic · Aug 3, 2020 · e7cf68a · e7cf68a
1 parent 3dde98a
commit e7cf68a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 28 deletions.
diff --git a/x-pack/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx b/x-pack/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx
@@ -64,35 +64,33 @@ describe('DatePicker', () => {
   });
 
   beforeEach(() => {
-    jest.clearAllMocks();
+    jest.resetAllMocks();
   });
 
-  it('should set default query params in the URL', () => {
+  it('sets default query params in the URL', () => {
     mountDatePicker();
     expect(mockHistoryPush).toHaveBeenCalledTimes(1);
     expect(mockHistoryPush).toHaveBeenCalledWith(
       expect.objectContaining({
-        search:
-          'rangeFrom=now-15m&rangeTo=now&refreshPaused=false&refreshInterval=10000',
+        search: 'rangeFrom=now-15m&rangeTo=now',
       })
     );
   });
 
-  it('should add missing default value', () => {
+  it('adds missing default value', () => {
     mountDatePicker({
       rangeTo: 'now',
       refreshInterval: 5000,
     });
     expect(mockHistoryPush).toHaveBeenCalledTimes(1);
     expect(mockHistoryPush).toHaveBeenCalledWith(
       expect.objectContaining({
-        search:
-          'rangeFrom=now-15m&rangeTo=now&refreshInterval=5000&refreshPaused=false',
+        search: 'rangeFrom=now-15m&rangeTo=now&refreshInterval=5000',
       })
     );
   });
 
-  it('should not set default query params in the URL when values already defined', () => {
+  it('does not set default query params in the URL when values already defined', () => {
     mountDatePicker({
       rangeFrom: 'now-1d',
       rangeTo: 'now',
@@ -102,7 +100,7 @@ describe('DatePicker', () => {
     expect(mockHistoryPush).toHaveBeenCalledTimes(0);
   });
 
-  it('should update the URL when the date range changes', () => {
+  it('updates the URL when the date range changes', () => {
     const datePicker = mountDatePicker();
     datePicker.find(EuiSuperDatePicker).props().onTimeChange({
       start: 'updated-start',
@@ -113,13 +111,12 @@ describe('DatePicker', () => {
     expect(mockHistoryPush).toHaveBeenCalledTimes(2);
     expect(mockHistoryPush).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        search:
-          'rangeFrom=updated-start&rangeTo=updated-end&refreshInterval=5000&refreshPaused=false',
+        search: 'rangeFrom=updated-start&rangeTo=updated-end',
       })
     );
   });
 
-  it('should auto-refresh when refreshPaused is false', async () => {
+  it('enables auto-refresh when refreshPaused is false', async () => {
     jest.useFakeTimers();
     const wrapper = mountDatePicker({
       refreshPaused: false,
@@ -132,7 +129,7 @@ describe('DatePicker', () => {
     wrapper.unmount();
   });
 
-  it('should NOT auto-refresh when refreshPaused is true', async () => {
+  it('disables auto-refresh when refreshPaused is true', async () => {
     jest.useFakeTimers();
     mountDatePicker({ refreshPaused: true, refreshInterval: 1000 });
     expect(mockRefreshTimeRange).not.toHaveBeenCalled();

diff --git a/x-pack/plugins/apm/public/components/shared/DatePicker/index.tsx b/x-pack/plugins/apm/public/components/shared/DatePicker/index.tsx
@@ -14,11 +14,7 @@ import { useUrlParams } from '../../../hooks/useUrlParams';
 import { clearCache } from '../../../services/rest/callApi';
 import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
 import { UI_SETTINGS } from '../../../../../../../src/plugins/data/common';
-import {
-  TimePickerQuickRange,
-  TimePickerTimeDefaults,
-  TimePickerRefreshInterval,
-} from './typings';
+import { TimePickerQuickRange, TimePickerTimeDefaults } from './typings';
 
 function removeUndefinedAndEmptyProps<T extends object>(obj: T): Partial<T> {
   return pickBy(obj, (value) => value !== undefined && !isEmpty(String(value)));
@@ -36,19 +32,9 @@ export function DatePicker() {
     UI_SETTINGS.TIMEPICKER_TIME_DEFAULTS
   );
 
-  const timePickerRefreshIntervalDefaults = core.uiSettings.get<
-    TimePickerRefreshInterval
-  >(UI_SETTINGS.TIMEPICKER_REFRESH_INTERVAL_DEFAULTS);
-
   const DEFAULT_VALUES = {
     rangeFrom: timePickerTimeDefaults.from,
     rangeTo: timePickerTimeDefaults.to,
-    refreshPaused: timePickerRefreshIntervalDefaults.pause,
-    /*
-     * Must be replaced by timePickerRefreshIntervalDefaults.value when this issue is fixed.
-     * https://github.com/elastic/kibana/issues/70562
-     */
-    refreshInterval: 10000,
   };
 
   const commonlyUsedRanges = timePickerQuickRanges.map(