Fixes from review: kuery param, getPath cleanup, use chrome.docTitle,…

… and teardown breadcrumb and doc title
elastic · May 14, 2020 · 2950370 · jfsiii · May 14, 2020 · jen-huang
1 parent 7a09c91
commit 2950370
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts
@@ -12,7 +12,6 @@ export type StaticPage =
   | 'configurations'
   | 'configurations_list'
   | 'fleet'
-  | 'fleet_agent_list'
   | 'fleet_enrollment_tokens'
   | 'data_streams';
 
@@ -22,6 +21,7 @@ export type DynamicPage =
   | 'add_datasource_from_configuration'
   | 'add_datasource_from_integration'
   | 'edit_datasource'
+  | 'fleet_agent_list'
   | 'fleet_agent_details';
 
 export type Page = StaticPage | DynamicPage;
@@ -77,7 +77,7 @@ export const pagePathGetters: {
   edit_datasource: ({ configId, datasourceId }) =>
     `/configs/${configId}/edit-datasource/${datasourceId}`,
   fleet: () => '/fleet',
-  fleet_agent_list: () => '/fleet/agents',
+  fleet_agent_list: ({ kuery }) => `/fleet/agents${kuery ? `?kuery=${kuery}` : ''}`,
   fleet_agent_details: ({ agentId, tabId }) =>
     `/fleet/agents/${agentId}${tabId ? `/${tabId}` : ''}`,
   fleet_enrollment_tokens: () => '/fleet/enrollment-tokens',

diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
@@ -219,9 +219,9 @@ export function useBreadcrumbs(page: Page, values: DynamicPagePathValues = {}) {
     ...breadcrumb,
     href: breadcrumb.href ? http.basePath.prepend(`${BASE_PATH}#${breadcrumb.href}`) : undefined,
   }));
-  document.title = [...breadcrumbs]
+  const docTitle: string[] = [...breadcrumbs]
     .reverse()
-    .map(breadcrumb => breadcrumb.text)
-    .join(' - ');
+    .map(breadcrumb => breadcrumb.text as string);
+  chrome.docTitle.change(docTitle);
   chrome.setBreadcrumbs(breadcrumbs);
 }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_link.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_link.ts
@@ -13,16 +13,14 @@ import {
 } from '../constants';
 import { useCore } from './';
 
-const getPath = (page: StaticPage | DynamicPage, values?: DynamicPagePathValues): string => {
+const getPath = (page: StaticPage | DynamicPage, values: DynamicPagePathValues = {}): string => {
   return values ? pagePathGetters[page](values) : pagePathGetters[page as StaticPage]();
 };
 
 export const useLink = () => {
   const core = useCore();
   return {
-    getPath: (page: StaticPage | DynamicPage, values?: DynamicPagePathValues) => {
-      return getPath(page, values);
-    },
+    getPath,
     getHref: (page: StaticPage | DynamicPage, values?: DynamicPagePathValues) => {
       const path = getPath(page, values);
       return core.http.basePath.prepend(`${BASE_PATH}#${path}`);

diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx
@@ -265,3 +265,8 @@ export function renderApp(
     ReactDOM.unmountComponentAtNode(element);
   };
 }
+
+export const teardownIngestManager = (coreStart: CoreStart) => {
+  coreStart.chrome.docTitle.reset();
+  coreStart.chrome.setBreadcrumbs([]);
+};
diff --git a/...ublic/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx b/...ublic/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx
@@ -22,9 +22,9 @@ export const LinkedAgentCount = memo<{ count: number; agentConfigId: string }>(
     );
     return count > 0 ? (
       <EuiLink
-        href={`${getHref(
-          'fleet_agent_list'
-        )}?kuery=${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentConfigId}`}
+        href={getHref('fleet_agent_list', {
+          kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentConfigId}`,
+        })}
       >
         {displayValue}
       </EuiLink>

diff --git a/x-pack/plugins/ingest_manager/public/plugin.ts b/x-pack/plugins/ingest_manager/public/plugin.ts
@@ -64,8 +64,13 @@ export class IngestManagerPlugin
           IngestManagerStartDeps,
           IngestManagerStart
         ];
-        const { renderApp } = await import('./applications/ingest_manager');
-        return renderApp(coreStart, params, deps, startDeps, config);
+        const { renderApp, teardownIngestManager } = await import('./applications/ingest_manager');
+        const unmount = renderApp(coreStart, params, deps, startDeps, config);
+
+        return () => {
 public stop() { 
 public stop() { 
+          unmount();
+          teardownIngestManager(coreStart);
+        };
       },
     });
   }