[ML] replace custom time range subject with timefilter

x-pack/plugins/ml/public/application/components/navigation_menu/date_picker_wrapper/date_picker_wrapper.tsx

@@ -9,10 +9,7 @@ import { Subscription } from 'rxjs';
 import { EuiSuperDatePicker, OnRefreshProps } from '@elastic/eui';
 import { TimeRange, TimeHistoryContract } from 'src/plugins/data/public';
 
-import {
-  mlTimefilterRefresh$,
-  mlTimefilterTimeChange$,
-} from '../../../services/timefilter_refresh_service';
+import { mlTimefilterRefresh$ } from '../../../services/timefilter_refresh_service';
 import { useUrlState } from '../../../util/url_state';
 import { useMlKibana } from '../../../contexts/kibana';
 
@@ -108,7 +105,6 @@ export const DatePickerWrapper: FC = () => {
     timefilter.setTime(newTime);
     setTime(newTime);
     setRecentlyUsedRanges(getRecentlyUsedRanges());
-    mlTimefilterTimeChange$.next({ lastRefresh: Date.now(), timeRange: { start, end } });
   }
 
   function updateInterval({

x-pack/plugins/ml/public/application/routing/use_refresh.ts

@@ -5,26 +5,36 @@
  */
 
 import { useObservable } from 'react-use';
-import { merge, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { merge } from 'rxjs';
+import { map, skip } from 'rxjs/operators';
 
+import { useMemo } from 'react';
 import { annotationsRefresh$ } from '../services/annotations_service';
-import {
-  mlTimefilterRefresh$,
-  mlTimefilterTimeChange$,
-} from '../services/timefilter_refresh_service';
+import { mlTimefilterRefresh$ } from '../services/timefilter_refresh_service';
+import { useTimefilter } from '../contexts/kibana';
 
 export interface Refresh {
   lastRefresh: number;
   timeRange?: { start: string; end: string };
 }
 
-const refresh$: Observable<Refresh> = merge(
-  mlTimefilterRefresh$,
-  mlTimefilterTimeChange$,
-  annotationsRefresh$.pipe(map((d) => ({ lastRefresh: d })))
-);
-
 export const useRefresh = () => {
+  const timefilter = useTimefilter();
+
+  const refresh$ = useMemo(() => {
+    return merge(
+      mlTimefilterRefresh$,
+      timefilter.getTimeUpdate$().pipe(
+        // skip initially emitted value
+        skip(1),
+        map((_) => {
+          const { from, to } = timefilter.getTime();
+          return { lastRefresh: Date.now(), timeRange: { start: from, end: to } };
+        })
+      ),
+      annotationsRefresh$.pipe(map((d) => ({ lastRefresh: d })))
+    );
+  }, []);
+
   return useObservable<Refresh>(refresh$);
 };

x-pack/plugins/ml/public/application/services/timefilter_refresh_service.tsx

@@ -9,4 +9,3 @@ import { Subject } from 'rxjs';
 import { Refresh } from '../routing/use_refresh';
 
 export const mlTimefilterRefresh$ = new Subject<Required<Refresh>>();
-export const mlTimefilterTimeChange$ = new Subject<Required<Refresh>>();