From 57686716c6ea0357ecbbcf35294b8d1c9efa290b Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Date: Thu, 2 Jul 2020 10:38:35 -0400
Subject: [PATCH] fix nav link to be hidden and update access tag

---
 .../security_solution/common/constants.ts     | 10 +++++++++
 .../security_solution/public/app/types.ts     | 10 +--------
 .../timeline/routes/create_timelines_route.ts |  2 +-
 .../timeline/routes/update_timelines_route.ts |  2 +-
 .../security_solution/server/plugin.ts        | 21 ++++++++++++++-----
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/x-pack/plugins/security_solution/common/constants.ts b/x-pack/plugins/security_solution/common/constants.ts
index f547bc8185d02..d32d9f01d61ae 100644
--- a/x-pack/plugins/security_solution/common/constants.ts
+++ b/x-pack/plugins/security_solution/common/constants.ts
@@ -35,6 +35,16 @@ export const DEFAULT_TIMEPICKER_QUICK_RANGES = 'timepicker:quickRanges';
 export const NO_ALERT_INDEX = 'no-alert-index-049FC71A-4C2C-446F-9901-37XMC5024C51';
 export const ENDPOINT_METADATA_INDEX = 'metrics-endpoint.metadata-*';
 
+export enum SecurityPageName {
+  alerts = 'alerts',
+  overview = 'overview',
+  hosts = 'hosts',
+  network = 'network',
+  timelines = 'timelines',
+  case = 'case',
+  management = 'management',
+}
+
 export const APP_OVERVIEW_PATH = `${APP_PATH}/overview`;
 export const APP_ALERTS_PATH = `${APP_PATH}/alerts`;
 export const APP_HOSTS_PATH = `${APP_PATH}/hosts`;
diff --git a/x-pack/plugins/security_solution/public/app/types.ts b/x-pack/plugins/security_solution/public/app/types.ts
index 4bd888e87bbdc..4590f05e12631 100644
--- a/x-pack/plugins/security_solution/public/app/types.ts
+++ b/x-pack/plugins/security_solution/public/app/types.ts
@@ -18,16 +18,8 @@ import { State, SubPluginsInitReducer } from '../common/store';
 import { Immutable } from '../../common/endpoint/types';
 import { AppAction } from '../common/store/actions';
 import { TimelineState } from '../timelines/store/timeline/types';
+export { SecurityPageName } from '../../common/constants';
 
-export enum SecurityPageName {
-  alerts = 'alerts',
-  overview = 'overview',
-  hosts = 'hosts',
-  network = 'network',
-  timelines = 'timelines',
-  case = 'case',
-  management = 'management',
-}
 export interface SecuritySubPluginStore<K extends SecuritySubPluginKeyStore, T> {
   initialState: Record<K, T | undefined>;
   reducer: Record<K, Reducer<T, AnyAction>>;
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.ts
index 60ddaea367aed..5bc4bec45dfb2 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.ts
@@ -33,7 +33,7 @@ export const createTimelinesRoute = (
         body: buildRouteValidation(createTimelineSchema),
       },
       options: {
-        tags: ['access:siem'],
+        tags: ['access:securitySolution'],
       },
     },
     async (context, request, response) => {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.ts
index f59df151b6955..a622ee9b15706 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.ts
@@ -31,7 +31,7 @@ export const updateTimelinesRoute = (
         body: buildRouteValidation(updateTimelineSchema),
       },
       options: {
-        tags: ['access:siem'],
+        tags: ['access:securitySolution'],
       },
     },
     // eslint-disable-next-line complexity
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
index 9bb1bea0949e0..b3c3a035b49e5 100644
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@@ -36,7 +36,7 @@ import { initSavedObjects, savedObjectTypes } from './saved_objects';
 import { AppClientFactory } from './client';
 import { createConfig$, ConfigType } from './config';
 import { initUiSettings } from './ui_settings';
-import { APP_ID, APP_ICON, SERVER_APP_ID } from '../common/constants';
+import { APP_ID, APP_ICON, SERVER_APP_ID, SecurityPageName } from '../common/constants';
 import { registerEndpointRoutes } from './endpoint/routes/metadata';
 import { registerResolverRoutes } from './endpoint/routes/resolver';
 import { registerPolicyRoutes } from './endpoint/routes/policy';
@@ -63,6 +63,17 @@ export interface PluginSetup {}
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface PluginStart {}
 
+const securitySubPlugins = [
+  APP_ID,
+  `${APP_ID}:${SecurityPageName.overview}`,
+  `${APP_ID}:${SecurityPageName.alerts}`,
+  `${APP_ID}:${SecurityPageName.hosts}`,
+  `${APP_ID}:${SecurityPageName.network}`,
+  `${APP_ID}:${SecurityPageName.timelines}`,
+  `${APP_ID}:${SecurityPageName.case}`,
+  `${APP_ID}:${SecurityPageName.management}`,
+];
+
 export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, StartPlugins> {
   private readonly logger: Logger;
   private readonly config$: Observable<ConfigType>;
@@ -128,12 +139,12 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
       }),
       order: 1100,
       icon: APP_ICON,
-      navLinkId: 'securitySolution',
-      app: ['securitySolution', 'kibana'],
+      navLinkId: APP_ID,
+      app: [...securitySubPlugins, 'kibana'],
       catalogue: ['securitySolution'],
       privileges: {
         all: {
-          app: ['securitySolution', 'kibana'],
+          app: [...securitySubPlugins, 'kibana'],
           catalogue: ['securitySolution'],
           api: ['securitySolution', 'actions-read', 'actions-all', 'alerting-read', 'alerting-all'],
           savedObject: {
@@ -161,7 +172,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
           ],
         },
         read: {
-          app: ['securitySolution', 'kibana'],
+          app: [...securitySubPlugins, 'kibana'],
           catalogue: ['securitySolution'],
           api: ['securitySolution', 'actions-read', 'actions-all', 'alerting-read', 'alerting-all'],
           savedObject: {