Fix merge conflicts

elastic · Jun 23, 2021 · 4364968 · 4364968
1 parent a3ce2f0
commit 4364968
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/...ic/common/components/navigation/use_security_solution_navigation/use_navigation_items.tsx b/...ic/common/components/navigation/use_security_solution_navigation/use_navigation_items.tsx
@@ -28,7 +28,7 @@ export const usePrimaryNavigationItems = ({
       items: [
         useSideNavItem({ ...props, tab: navTabs.overview }),
         // TODO: [1101] Move the following nav items to its group
-        useSideNavItem({ ...props, tab: navTabs.detections }),
+        useSideNavItem({ ...props, tab: navTabs.administration }),
       ],
     },
     {
@@ -112,12 +112,7 @@ const useSideNavItem = ({
     track(METRIC_TYPE.CLICK, `${TELEMETRY_EVENT.TAB_CLICKED}${id}`);
   };
 
-  const appHref =
-    id === 'overview' || id === 'timelines' || id === 'case'
-      ? getUrlForApp(APP_ID, { deepLinkId: id, path: urlSearch })
-      : getUrlForApp(`${APP_ID}:${id}`, {
-          path: urlSearch,
-        });
+  const appHref = getUrlForApp(APP_ID, { deepLinkId: id, path: urlSearch });
 
   return {
     'data-href': appHref,

diff --git a/...lugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.tsx b/...lugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { useState, useCallback, useMemo } from 'react';
-import { useParams, useHistory } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import { EuiTabs, EuiTab, EuiSpacer } from '@elastic/eui';
 
 import { noop } from 'lodash/fp';