[SideNav] Make solutions navigation respect 'visibleIn': ['sideNav']

src/core/packages/application/browser-internal/src/utils/constants.ts

@@ -9,6 +9,10 @@
 
 import type { AppDeepLinkLocations } from '@kbn/core-application-browser/src/application';
 
-export const DEFAULT_APP_VISIBILITY: AppDeepLinkLocations[] = ['globalSearch', 'sideNav'];
+export const DEFAULT_APP_VISIBILITY: AppDeepLinkLocations[] = [
+  'globalSearch',
+  'classicSideNav',
+  'solutionSideNav',
+];
 
 export const DEFAULT_LINK_VISIBILITY: AppDeepLinkLocations[] = ['globalSearch'];

src/core/packages/application/browser-internal/src/utils/get_app_info.test.ts

@@ -41,7 +41,7 @@ describe('getAppInfo', () => {
       id: 'some-id',
       title: 'some-title',
       status: AppStatus.accessible,
-      visibleIn: ['globalSearch', 'sideNav'],
+      visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
       appRoute: `/app/some-id`,
       keywords: [],
       deepLinks: [],
@@ -70,7 +70,7 @@ describe('getAppInfo', () => {
       id: 'some-id',
       title: 'some-title',
       status: AppStatus.accessible,
-      visibleIn: ['globalSearch', 'sideNav'],
+      visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
       appRoute: `/app/some-id`,
       keywords: [],
       deepLinks: [
@@ -98,7 +98,7 @@ describe('getAppInfo', () => {
     expect(
       getAppInfo(
         createApp({
-          visibleIn: ['globalSearch', 'sideNav'],
+          visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
           status: AppStatus.inaccessible,
         })
       )
@@ -110,25 +110,25 @@ describe('getAppInfo', () => {
     expect(
       getAppInfo(
         createApp({
-          visibleIn: ['globalSearch', 'sideNav'],
+          visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
           status: AppStatus.accessible,
         })
       )
     ).toEqual(
       expect.objectContaining({
-        visibleIn: ['globalSearch', 'sideNav'],
+        visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
       })
     );
     expect(
       getAppInfo(
         createApp({
           // status is not set, default to accessible
-          visibleIn: ['globalSearch', 'sideNav'],
+          visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
         })
       )
     ).toEqual(
       expect.objectContaining({
-        visibleIn: ['globalSearch', 'sideNav'],
+        visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
       })
     );
   });
@@ -159,7 +159,7 @@ describe('getAppInfo', () => {
       id: 'some-id',
       title: 'some-title',
       status: AppStatus.accessible,
-      visibleIn: ['globalSearch', 'sideNav'],
+      visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
       appRoute: `/app/some-id`,
       keywords: [],
       order: 3,
@@ -192,7 +192,7 @@ describe('getAppInfo', () => {
         createApp({
           deepLinks: [
             createDeepLink({
-              visibleIn: ['globalSearch', 'sideNav'],
+              visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
             }),
           ],
         })
@@ -201,7 +201,7 @@ describe('getAppInfo', () => {
       expect.objectContaining({
         deepLinks: [
           expect.objectContaining({
-            visibleIn: ['globalSearch', 'sideNav'],
+            visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
           }),
         ],
       })

src/core/packages/application/browser/src/application.ts

@@ -102,18 +102,16 @@ export interface App<HistoryLocationState = unknown> extends AppNavOptions {
   status?: AppStatus;
 
   /**
-   * Optional list of locations where the app is visible.
+   * Locations where the app is visible. Each value enables one surface:
+   * - `globalSearch`: top-bar search results
+   * - `classicSideNav`: classic (hamburger) side navigation
+   * - `solutionSideNav`: solution side navs (Observability, Security, Search)
+   * - `home`: Kibana home page
+   * - `kibanaOverview`: Kibana overview page
    *
-   * Accepts the following values:
-   * - "globalSearch": the link will appear in the global search bar
-   * - "home": the link will appear on the Kibana home page
-   * - "kibanaOverview": the link will appear in the Kibana overview page
-   * - "sideNav": the link will appear in the side navigation.
-   *   Note: "sideNav" will be deprecated when we change the navigation to "solutions" style.
-   *
-   * @default ['globalSearch', 'sideNav']
+   * @default ['globalSearch', 'classicSideNav', 'solutionSideNav']
    * unless the status is marked as `inaccessible`.
-   * @note Set to `[]` (empty array) to hide this link
+   * @note Set to `[]` (empty array) to hide this link from every surface.
    */
   visibleIn?: AppDeepLinkLocations[];
 
@@ -150,9 +148,9 @@ export interface App<HistoryLocationState = unknown> extends AppNavOptions {
    *
    *   start() {
    *      // later, when the navlink needs to be updated
-   *      appUpdater.next(() => {
+   *      appUpdater.next(() => ({
    *        visibleIn: ['globalSearch'],
-   *      })
+   *      }))
    *   }
    * ```
    */
@@ -254,7 +252,13 @@ export type PublicAppDeepLinkInfo = Omit<AppDeepLink, 'deepLinks' | 'keywords' |
 };
 
 /** The places in the UI where a deepLink can be shown */
-export type AppDeepLinkLocations = 'globalSearch' | 'sideNav' | 'home' | 'kibanaOverview';
+export type AppDeepLinkLocations =
+  | 'globalSearch'
+  | 'classicSideNav'
+  // TODO: rename to 'sideNav' when 'classicSideNav' is removed (classic nav deprecation).
+  | 'solutionSideNav'
+  | 'home'
+  | 'kibanaOverview';
 
 /**
  * Input type for registering secondary in-app locations for an application.
@@ -272,7 +276,8 @@ export type AppDeepLink<Id extends string = string> = {
   /** Optional keywords to match with in deep links search. Omit if this part of the hierarchy does not have a page URL. */
   keywords?: string[];
   /**
-   * Optional list of locations where the deepLink is visible. By default the deepLink is visible in "globalSearch".
+   * Locations where the deep link is visible. See {@link App.visibleIn} for the list of surfaces.
+   * @default ['globalSearch']
    */
   visibleIn?: AppDeepLinkLocations[];
   /**

src/core/packages/chrome/browser-components/src/classic/collapsible_nav.test.tsx

@@ -22,7 +22,7 @@ import { CollapsibleNav } from './collapsible_nav';
 
 const { kibana, observability, security, management } = DEFAULT_APP_CATEGORIES;
 
-const visibleIn = ['globalSearch' as const, 'sideNav' as const];
+const visibleIn = ['globalSearch' as const, 'classicSideNav' as const, 'solutionSideNav' as const];
 
 function mockLink({ title = 'discover', category }: Partial<ChromeNavLink>) {
   return {

src/core/packages/chrome/browser-components/src/classic/collapsible_nav.tsx

@@ -141,7 +141,7 @@ export function CollapsibleNav({
       allLinks.filter(
         (link) =>
           // Filterting out hidden links,
-          link.visibleIn.includes('sideNav') &&
+          link.visibleIn.includes('classicSideNav') &&
           // and non-data overview pages
           !overviewIDsToHide.includes(link.id)
       ),

src/core/packages/chrome/browser-components/src/project/sidenav/navigation/to_navigation_items.test.tsx

@@ -254,7 +254,7 @@ describe('hidden panel link', () => {
         baseUrl: '/',
         href: '/app/management',
         url: '/app/management',
-        visibleIn: ['sideNav'],
+        visibleIn: ['classicSideNav', 'solutionSideNav'],
       },
       sideNavStatus: 'hidden',
       id: 'stack_management',

src/core/packages/chrome/browser-internal/src/services/nav_links/nav_links_service.test.ts

@@ -28,7 +28,7 @@ const availableApps: ReadonlyMap<string, App> = new Map([
           order: 50,
           title: 'Deep App 1',
           path: '/deepapp1',
-          visibleIn: ['sideNav'],
+          visibleIn: ['classicSideNav', 'solutionSideNav'],
           deepLinks: [
             {
               id: 'deepApp2',

src/core/packages/chrome/browser-internal/src/services/nav_links/to_nav_link.test.ts

@@ -47,7 +47,7 @@ describe('toNavLink', () => {
         order: 12,
         tooltip: 'tooltip',
         euiIconType: 'my-icon',
-        visibleIn: ['sideNav'],
+        visibleIn: ['classicSideNav', 'solutionSideNav'],
       }),
       basePath
     );
@@ -58,7 +58,7 @@ describe('toNavLink', () => {
         order: 12,
         tooltip: 'tooltip',
         euiIconType: 'my-icon',
-        visibleIn: ['sideNav'],
+        visibleIn: ['classicSideNav', 'solutionSideNav'],
       })
     );
   });

src/core/packages/chrome/browser-internal/src/services/project_navigation/project_navigation_service.test.ts

@@ -42,7 +42,7 @@ const getNavLink = (partial: Partial<ChromeNavLink> = {}): ChromeNavLink => ({
   baseUrl: '/app',
   url: `/app/${partial.id ?? 'kibana'}`,
   href: `/app/${partial.id ?? 'kibana'}`,
-  visibleIn: ['globalSearch'],
+  visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
   ...partial,
 });
 
@@ -208,6 +208,89 @@ describe('initNavigation()', () => {
       expect(node.children?.[0].href).toBe('https://elastic.co');
     });
 
+    test('should filter out deepLinks that exclude solutionSideNav from visibleIn', async () => {
+      const { projectNavigation: svc, navLinksService: nls } = setup({
+        navLinkIds: ['management:genAiSettings'],
+      });
+
+      // Add a second link that is registered but explicitly excludes solutionSideNav
+      const evalsNoSideNav: ChromeNavLink = getNavLink({
+        id: 'management:evals',
+        title: 'MANAGEMENT:EVALS',
+        visibleIn: ['globalSearch'],
+      });
+      const existing = nls.getAll();
+      nls.getNavLinks$.mockReturnValue(of([...existing, evalsNoSideNav]));
+      nls.getAll.mockReturnValue([...existing, evalsNoSideNav]);
+
+      svc.initNavigation<any>(
+        'es',
+        of({
+          body: [
+            {
+              id: 'group1',
+              type: 'navGroup',
+              children: [
+                { link: 'management:genAiSettings' },
+                { link: 'management:evals' }, // registered but no solutionSideNav → removed
+              ],
+            },
+          ],
+        })
+      );
+
+      const treeDefinition = await lastValueFrom(
+        svc.getNavigation$().pipe(
+          take(1),
+          map((nav) => nav.navigationTree)
+        )
+      );
+
+      const [node] = treeDefinition.body as [ChromeProjectNavigationNode];
+      expect(node.children?.map((c) => c.id)).toEqual(['management:genAiSettings']);
+    });
+
+    test('removes deepLinks from the solution nav tree when their visibleIn excludes solutionSideNav', async () => {
+      const { projectNavigation: svc, navLinksService: nls } = setup({
+        navLinkIds: ['management:genAiSettings'],
+      });
+
+      const classicOnlyLink: ChromeNavLink = getNavLink({
+        id: 'management:evals',
+        title: 'MANAGEMENT:EVALS',
+        visibleIn: ['globalSearch', 'classicSideNav'],
+      });
+      const existing = nls.getAll();
+      nls.getNavLinks$.mockReturnValue(of([...existing, classicOnlyLink]));
+      nls.getAll.mockReturnValue([...existing, classicOnlyLink]);
+
+      svc.initNavigation<any>(
+        'es',
+        of({
+          body: [
+            {
+              id: 'group1',
+              type: 'navGroup',
+              children: [
+                { link: 'management:genAiSettings' },
+                { link: 'management:evals' }, // visibleIn excludes solutionSideNav → removed
+              ],
+            },
+          ],
+        })
+      );
+
+      const treeDefinition = await lastValueFrom(
+        svc.getNavigation$().pipe(
+          take(1),
+          map((nav) => nav.navigationTree)
+        )
+      );
+
+      const [node] = treeDefinition.body as [ChromeProjectNavigationNode];
+      expect(node.children?.map((c) => c.id)).toEqual(['management:genAiSettings']);
+    });
+
     test('should filter out missing deepLinks (e.g. evals) from the navigation tree', async () => {
       const { projectNavigation: projectNavigationService } = setup({
         navLinkIds: ['management:genAiSettings'],
@@ -289,7 +372,7 @@ describe('initNavigation()', () => {
                   id: 'foo',
                   title: 'FOO',
                   url: '/app/foo',
-                  visibleIn: ['globalSearch'],
+                  visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
                 },
                 href: '/app/foo',
                 id: 'foo',
@@ -838,7 +921,7 @@ describe('getNavigation$() active nodes', () => {
             baseUrl: '/app',
             url: '/app/item1',
             href: '/app/item1',
-            visibleIn: ['globalSearch'],
+            visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
           },
         },
       ],
@@ -892,7 +975,7 @@ describe('getNavigation$() active nodes', () => {
             baseUrl: '/app',
             url: '/app/item1',
             href: '/app/item1',
-            visibleIn: ['globalSearch'],
+            visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
           },
           getIsActive: expect.any(Function),
         },

src/core/packages/chrome/browser-internal/src/services/project_navigation/utils.test.ts

@@ -21,7 +21,7 @@ const getDeepLink = (id: string, path: string, title = ''): ChromeNavLink => ({
   href: `http://mocked/kibana/foo/${path}`,
   title,
   baseUrl: '',
-  visibleIn: ['globalSearch'],
+  visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav'],
 });
 
 describe('flattenNav', () => {

src/core/packages/chrome/browser-internal/src/services/project_navigation/utils.ts

@@ -177,8 +177,8 @@ function getNodeStatus(
   },
   { cloudLinks }: { cloudLinks: CloudLinks }
 ): SideNavNodeStatus | 'remove' {
-  if (link && !deepLink) {
-    // If a link is provided, but no deepLink is found, don't render anything
+  if (link && (!deepLink || !deepLink.visibleIn.includes('solutionSideNav'))) {
+    // If a link is provided but no deepLink found, or the app excluded solutionSideNav
     return 'remove';
   }
 

src/platform/plugins/private/kibana_overview/public/plugin.ts

@@ -67,7 +67,7 @@ export class KibanaOverviewPlugin
       order: 1,
       updater$: appUpdater$,
       appRoute: PLUGIN_PATH,
-      visibleIn: ['globalSearch', 'home', 'sideNav'],
+      visibleIn: ['globalSearch', 'home', 'classicSideNav', 'solutionSideNav'],
       async mount(params: AppMountParameters) {
         // Load application bundle
         const { renderApp } = await import('./application');

src/platform/plugins/shared/dev_tools/public/plugin.ts

@@ -130,6 +130,7 @@ export class DevToolsPlugin implements Plugin<DevToolsSetup, void> {
               id: tool.id,
               title: tool.title as string,
               path: `#/${tool.id}`,
+              visibleIn: ['globalSearch', 'solutionSideNav'],
             };
             if (!devtoolsDeeplinkIds.some((id) => id === deepLink.id)) {
               throw new Error('Deeplink must be registered in package.');

src/platform/plugins/shared/discover/public/plugin.tsx

@@ -184,7 +184,7 @@ export class DiscoverPlugin
       euiIconType: 'logoKibana',
       defaultPath: '#/',
       category: DEFAULT_APP_CATEGORIES.kibana,
-      visibleIn: ['globalSearch', 'sideNav', 'kibanaOverview'],
+      visibleIn: ['globalSearch', 'classicSideNav', 'solutionSideNav', 'kibanaOverview'],
       mount: async (params: AppMountParameters) => {
         const [[coreStart, discoverStartPlugins], historyService, ebtManager, { renderApp }] =
           await Promise.all([

src/platform/plugins/shared/management/public/plugin.tsx

@@ -83,7 +83,7 @@ export class ManagementPlugin
             title: mgmtApp.title,
             path: mgmtApp.basePath,
             keywords: mgmtApp.keywords,
-            ...(mgmtApp.visibleIn ? { visibleIn: mgmtApp.visibleIn } : {}),
+            visibleIn: mgmtApp.visibleIn ?? ['globalSearch', 'solutionSideNav'],
           })),
       }));