[ML] Extend MlUrlGenerator to support other ML pages

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.refreshinterval.md

@@ -14,6 +14,7 @@ export interface RefreshInterval
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [display](./kibana-plugin-plugins-data-public.refreshinterval.display.md) | <code>string</code> |  |
 |  [pause](./kibana-plugin-plugins-data-public.refreshinterval.pause.md) | <code>boolean</code> |  |
 |  [value](./kibana-plugin-plugins-data-public.refreshinterval.value.md) | <code>number</code> |  |
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timerange.md

@@ -15,6 +15,6 @@ export interface TimeRange
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [from](./kibana-plugin-plugins-data-public.timerange.from.md) | <code>string</code> |  |
-|  [mode](./kibana-plugin-plugins-data-public.timerange.mode.md) | <code>'absolute' &#124; 'relative'</code> |  |
+|  [mode](./kibana-plugin-plugins-data-public.timerange.mode.md) | <code>'absolute' &#124; 'relative' &#124; 'quick'</code> |  |
 |  [to](./kibana-plugin-plugins-data-public.timerange.to.md) | <code>string</code> |  |
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timerange.mode.md

@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-mode?: 'absolute' | 'relative';
+mode?: 'absolute' | 'relative' | 'quick';
 ```

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.refreshinterval.md

@@ -14,6 +14,7 @@ export interface RefreshInterval
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [display](./kibana-plugin-plugins-data-server.refreshinterval.display.md) | <code>string</code> |  |
 |  [pause](./kibana-plugin-plugins-data-server.refreshinterval.pause.md) | <code>boolean</code> |  |
 |  [value](./kibana-plugin-plugins-data-server.refreshinterval.value.md) | <code>number</code> |  |
 

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.timerange.md

@@ -15,6 +15,6 @@ export interface TimeRange
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [from](./kibana-plugin-plugins-data-server.timerange.from.md) | <code>string</code> |  |
-|  [mode](./kibana-plugin-plugins-data-server.timerange.mode.md) | <code>'absolute' &#124; 'relative'</code> |  |
+|  [mode](./kibana-plugin-plugins-data-server.timerange.mode.md) | <code>'absolute' &#124; 'relative' &#124; 'quick'</code> |  |
 |  [to](./kibana-plugin-plugins-data-server.timerange.to.md) | <code>string</code> |  |
 

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.timerange.mode.md

@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-mode?: 'absolute' | 'relative';
+mode?: 'absolute' | 'relative' | 'quick';
 ```

src/plugins/data/common/query/timefilter/types.ts

@@ -20,14 +20,15 @@
 import { Moment } from 'moment';
 
 export interface RefreshInterval {
+  display?: string;
   pause: boolean;
   value: number;
 }
 
 export interface TimeRange {
   from: string;
   to: string;
-  mode?: 'absolute' | 'relative';
+  mode?: 'absolute' | 'relative' | 'quick';
 }
 
 export interface TimeRangeBounds {

src/plugins/data/public/public.api.md

@@ -1607,6 +1607,8 @@ export interface RangeFilterParams {
 //
 // @public (undocumented)
 export interface RefreshInterval {
+    // (undocumented)
+    display?: string;
     // (undocumented)
     pause: boolean;
     // (undocumented)
@@ -1906,7 +1908,7 @@ export interface TimeRange {
     // (undocumented)
     from: string;
     // (undocumented)
-    mode?: 'absolute' | 'relative';
+    mode?: 'absolute' | 'relative' | 'quick';
     // (undocumented)
     to: string;
 }

src/plugins/data/server/server.api.md

@@ -923,6 +923,8 @@ export interface Query {
 //
 // @public (undocumented)
 export interface RefreshInterval {
+    // (undocumented)
+    display?: string;
     // (undocumented)
     pause: boolean;
     // (undocumented)
@@ -1009,7 +1011,7 @@ export interface TimeRange {
     // (undocumented)
     from: string;
     // (undocumented)
-    mode?: 'absolute' | 'relative';
+    mode?: 'absolute' | 'relative' | 'quick';
     // (undocumented)
     to: string;
 }

x-pack/plugins/ml/public/application/contexts/kibana/index.ts

@@ -9,3 +9,4 @@ export { useNavigateToPath, NavigateToPath } from './use_navigate_to_path';
 export { useUiSettings } from './use_ui_settings_context';
 export { useTimefilter } from './use_timefilter';
 export { useNotifications } from './use_notifications_context';
+export { useMlUrlGenerator } from './use_create_url';

x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts

@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useMlKibana } from './kibana_context';
+import { ML_APP_URL_GENERATOR } from '../../../url_generator';
+
+export const useMlUrlGenerator = () => {
+  const {
+    services: {
+      share: {
+        urlGenerators: { getUrlGenerator },
+      },
+    },
+  } = useMlKibana();
+
+  return getUrlGenerator(ML_APP_URL_GENERATOR);
+};

x-pack/plugins/ml/public/application/contexts/kibana/use_navigate_to_path.ts

@@ -21,14 +21,19 @@ export const useNavigateToPath = () => {
 
   const location = useLocation();
 
-  return useMemo(
-    () => (path: string | undefined, preserveSearch = false) => {
-      navigateToUrl(
-        getUrlForApp(PLUGIN_ID, {
-          path: `${path}${preserveSearch === true ? location.search : ''}`,
-        })
-      );
-    },
-    [location]
-  );
+  return useMemo(() => {
+    return (path: string | undefined, preserveSearch = false) => {
+      if (path === undefined) return;
+      const modifiedPath = `${path}${preserveSearch === true ? location.search : ''}`;
+      /**
+       * Handle urls generated by MlUrlGenerator where '/app/ml' is automatically prepended
+       */
+      const url = modifiedPath.startsWith('/app/ml')
+        ? modifiedPath
+        : getUrlForApp(PLUGIN_ID, {
+            path: modifiedPath,
+          });
+      navigateToUrl(url);
+    };
+  }, [location]);
 };

x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/back_to_list_panel/back_to_list_panel.tsx

@@ -7,13 +7,20 @@
 import React, { FC, Fragment } from 'react';
 import { EuiCard, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useNavigateToPath } from '../../../../../contexts/kibana';
+import { useMlKibana, useMlUrlGenerator } from '../../../../../contexts/kibana';
+import { ML_PAGES } from '../../../../../../url_generator';
 
 export const BackToListPanel: FC = () => {
-  const navigateToPath = useNavigateToPath();
+  const urlGenerator = useMlUrlGenerator();
+  const {
+    services: {
+      application: { navigateToUrl },
+    },
+  } = useMlKibana();
 
   const redirectToAnalyticsManagementPage = async () => {
-    await navigateToPath('/data_frame_analytics');
+    const url = await urlGenerator.createUrl({ page: ML_PAGES.DATA_FRAME_ANALYTICS });
+    await navigateToUrl(url);
   };
 
   return (

x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx

@@ -7,20 +7,26 @@
 import React, { FC, Fragment } from 'react';
 import { EuiCard, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useNavigateToPath } from '../../../../../contexts/kibana';
-import { getResultsUrl } from '../../../analytics_management/components/analytics_list/common';
+import { useMlUrlGenerator } from '../../../../../contexts/kibana';
 import { ANALYSIS_CONFIG_TYPE } from '../../../../common/analytics';
+import { useNavigateToPath } from '../../../../../contexts/kibana';
+import { ML_PAGES } from '../../../../../../url_generator';
 
 interface Props {
   jobId: string;
   analysisType: ANALYSIS_CONFIG_TYPE;
 }
 
 export const ViewResultsPanel: FC<Props> = ({ jobId, analysisType }) => {
+  const urlGenerator = useMlUrlGenerator();
   const navigateToPath = useNavigateToPath();
 
-  const redirectToAnalyticsManagementPage = async () => {
-    const path = getResultsUrl(jobId, analysisType);
+  const redirectToAnalyticsJobPage = async () => {
+    const path = await urlGenerator.createUrl({
+      page: ML_PAGES.DATA_FRAME_ANALYTICS_EXPLORATION,
+      jobId,
+      analysisType,
+    });
     await navigateToPath(path);
   };
 
@@ -38,7 +44,7 @@ export const ViewResultsPanel: FC<Props> = ({ jobId, analysisType }) => {
             defaultMessage: 'View results for the analytics job.',
           }
         )}
-        onClick={redirectToAnalyticsManagementPage}
+        onClick={redirectToAnalyticsJobPage}
         data-test-subj="analyticsWizardViewResultsCard"
       />
     </Fragment>

x-pack/plugins/ml/public/application/explorer/explorer_dashboard_service.ts

@@ -65,6 +65,7 @@ export interface ExplorerAppState {
     filteredFields?: string[];
     queryString?: string;
   };
+  query?: any;
 }
 
 const explorerAppState$: Observable<ExplorerAppState> = explorerState$.pipe(

x-pack/plugins/ml/public/application/routing/router.tsx

@@ -75,7 +75,6 @@ const MlRoutes: FC<{
   pageDeps: PageDependencies;
 }> = ({ pageDeps }) => {
   const navigateToPath = useNavigateToPath();
-
   return (
     <>
       {Object.entries(routes).map(([name, routeFactory]) => {