fix link navigation

elastic · Jul 8, 2020 · e11fda6 · e11fda6
1 parent 97c4234
commit e11fda6
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 11 deletions.
diff --git a/.../components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx b/.../components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx
@@ -12,6 +12,7 @@ import { HttpSetup } from 'kibana/public';
 import {
   notificationServiceMock,
   docLinksServiceMock,
+  applicationServiceMock,
 } from '../../../../../../../../../../src/core/public/mocks';
 
 import { ComponentTemplatesProvider } from '../../../component_templates_context';
@@ -28,6 +29,7 @@ const appDependencies = {
   docLinks: docLinksServiceMock.createStartContract(),
   toasts: notificationServiceMock.createSetupContract().toasts,
   setBreadcrumbs: () => {},
+  navigateToApp: applicationServiceMock.createStartContract().navigateToApp,
 };
 
 export const setupEnvironment = () => {

diff --git a/...lic/application/components/component_templates/component_template_details/tab_summary.tsx b/...lic/application/components/component_templates/component_template_details/tab_summary.tsx
@@ -30,7 +30,7 @@ export const TabSummary: React.FunctionComponent<Props> = ({
   componentTemplateDetails,
   showCallToAction,
 }) => {
-  const { httpClient } = useComponentTemplatesContext();
+  const { navigateToApp } = useComponentTemplatesContext();
 
   const { version, _meta, _kbnMeta } = componentTemplateDetails;
 
@@ -61,9 +61,11 @@ export const TabSummary: React.FunctionComponent<Props> = ({
                   values={{
                     createLink: (
                       <EuiLink
-                        href={httpClient.basePath.prepend(
-                          '/app/management/data/index_management/create_template'
-                        )}
+                        onClick={() =>
+                          navigateToApp('management', {
+                            path: '/data/index_management/create_template',
+                          })
+                        }
                       >
                         <FormattedMessage
                           id="xpack.idxMgmt.componentTemplateDetails.summaryTab.createTemplateLink"
@@ -73,9 +75,9 @@ export const TabSummary: React.FunctionComponent<Props> = ({
                     ),
                     editLink: (
                       <EuiLink
-                        href={httpClient.basePath.prepend(
-                          '/app/management/data/index_management/templates'
-                        )}
+                        onClick={() =>
+                          navigateToApp('management', { path: '/data/index_management/templates' })
+                        }
                       >
                         <FormattedMessage
                           id="xpack.idxMgmt.componentTemplateDetails.summaryTab.updateTemplateLink"

diff --git a/...agement/public/application/components/component_templates/component_templates_context.tsx b/...agement/public/application/components/component_templates/component_templates_context.tsx
@@ -5,7 +5,7 @@
  */
 
 import React, { createContext, useContext } from 'react';
-import { HttpSetup, DocLinksStart, NotificationsSetup } from 'src/core/public';
+import { HttpSetup, DocLinksStart, NotificationsSetup, CoreStart } from 'src/core/public';
 
 import { ManagementAppMountParams } from 'src/plugins/management/public';
 import { getApi, getUseRequest, getSendRequest, getDocumentation, getBreadcrumbs } from './lib';
@@ -19,6 +19,7 @@ interface Props {
   docLinks: DocLinksStart;
   toasts: NotificationsSetup['toasts'];
   setBreadcrumbs: ManagementAppMountParams['setBreadcrumbs'];
+  navigateToApp: CoreStart['application']['navigateToApp'];
 }
 
 interface Context {
@@ -29,6 +30,7 @@ interface Context {
   breadcrumbs: ReturnType<typeof getBreadcrumbs>;
   trackMetric: (type: 'loaded' | 'click' | 'count', eventName: string) => void;
   toasts: NotificationsSetup['toasts'];
+  navigateToApp: CoreStart['application']['navigateToApp'];
 }
 
 export const ComponentTemplatesProvider = ({
@@ -38,7 +40,15 @@ export const ComponentTemplatesProvider = ({
   value: Props;
   children: React.ReactNode;
 }) => {
-  const { httpClient, apiBasePath, trackMetric, docLinks, toasts, setBreadcrumbs } = value;
+  const {
+    httpClient,
+    apiBasePath,
+    trackMetric,
+    docLinks,
+    toasts,
+    setBreadcrumbs,
+    navigateToApp,
+  } = value;
 
   const useRequest = getUseRequest(httpClient);
   const sendRequest = getSendRequest(httpClient);
@@ -49,7 +59,16 @@ export const ComponentTemplatesProvider = ({
 
   return (
     <ComponentTemplatesContext.Provider
-      value={{ api, documentation, trackMetric, toasts, httpClient, apiBasePath, breadcrumbs }}
+      value={{
+        api,
+        documentation,
+        trackMetric,
+        toasts,
+        httpClient,
+        apiBasePath,
+        breadcrumbs,
+        navigateToApp,
+      }}
     >
       {children}
     </ComponentTemplatesContext.Provider>

diff --git a/x-pack/plugins/index_management/public/application/index.tsx b/x-pack/plugins/index_management/public/application/index.tsx
@@ -25,7 +25,7 @@ export const renderApp = (
     return () => undefined;
   }
 
-  const { i18n, docLinks, notifications } = core;
+  const { i18n, docLinks, notifications, application } = core;
   const { Context: I18nContext } = i18n;
   const { services, history, setBreadcrumbs } = dependencies;
 
@@ -36,6 +36,7 @@ export const renderApp = (
     docLinks,
     toasts: notifications.toasts,
     setBreadcrumbs,
+    navigateToApp: application.navigateToApp,
   };
 
   render(