From 2f22073ad8de889c10bcb8c44cd03bc248fae32b Mon Sep 17 00:00:00 2001
From: Andrej Ocenas <mr.ocenas@gmail.com>
Date: Fri, 24 Oct 2025 15:04:24 +0200
Subject: [PATCH] Plugin navigation: Fix active nav item selection when there
 are more than 10 items in a group (#112886)

Fix passing depth in map function
---
 public/app/features/plugins/utils.test.ts | 44 +++++++++++++----------
 public/app/features/plugins/utils.ts      |  2 +-
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/public/app/features/plugins/utils.test.ts b/public/app/features/plugins/utils.test.ts
index 533228ac99e..cfc6153f6ab 100644
--- a/public/app/features/plugins/utils.test.ts
+++ b/public/app/features/plugins/utils.test.ts
@@ -1,3 +1,5 @@
+import { range } from 'lodash';
+
 import { NavModelItem } from '@grafana/data';
 import { HOME_NAV_ID } from 'app/core/reducers/navModel';
 
@@ -9,31 +11,28 @@ describe('buildPluginSectionNav', () => {
     id: 'plugin-page-app1',
     url: '/a/plugin1',
     children: [
-      {
-        text: 'page1',
-        url: '/a/plugin1/page1',
-      },
-      {
-        text: 'page2',
-        url: '/a/plugin1/page2',
-      },
-      {
-        text: 'page3',
-        url: '/a/plugin1/page3',
-        children: [
-          {
-            text: 'page4',
-            url: '/a/plugin1/page3/page4',
-          },
-        ],
-      },
+      { text: 'page1', url: '/a/plugin1/page1' },
+      { text: 'page2', url: '/a/plugin1/page2' },
+      { text: 'page3', url: '/a/plugin1/page3', children: [{ text: 'page4', url: '/a/plugin1/page3/page4' }] },
     ],
   };
 
   const appsSection = {
     text: 'apps',
     id: 'apps',
-    children: [app1],
+    children: [
+      app1,
+      ...range(10).map((index): NavModelItem => {
+        const n = index + 2;
+        const url = `/a/plugin${n}`;
+        return {
+          text: `App${n}`,
+          id: `plugin-page-app${n}`,
+          url,
+          children: [{ text: `page1 of app ${n}`, url: `${url}/page1` }],
+        };
+      }),
+    ],
   };
 
   const home = {
@@ -92,4 +91,11 @@ describe('buildPluginSectionNav', () => {
     expect(result?.main.children![0].children![2].children![0].active).toBe(true);
     expect(result?.node.text).toBe('page4');
   });
+
+  it('Should set nested active page with many siblings', () => {
+    // Making sure we correctly account for the depth limit and not apply it to sibling items
+    const result = buildPluginSectionNav('/a/plugin11/page1', appsSection);
+    expect(result?.main.children![10].children![0].active).toBe(true);
+    expect(result?.node.text).toBe('page1 of app 11');
+  });
 });
diff --git a/public/app/features/plugins/utils.ts b/public/app/features/plugins/utils.ts
index 17df6db1a89..8852863367e 100644
--- a/public/app/features/plugins/utils.ts
+++ b/public/app/features/plugins/utils.ts
@@ -79,7 +79,7 @@ export function buildPluginSectionNav(currentUrl: string, pluginNavSection?: Nav
   }
 
   // Find and set active page
-  copiedPluginNavSection.children = (copiedPluginNavSection?.children ?? []).map(findAndSetActivePage);
+  copiedPluginNavSection.children = (copiedPluginNavSection?.children ?? []).map((item) => findAndSetActivePage(item));
 
   return { main: copiedPluginNavSection, node: activePage ?? copiedPluginNavSection };
 }