From 93a1c84829e9518e5d8a79b3700de8c39bdcb52a Mon Sep 17 00:00:00 2001
From: Taras Hlukhovetskyi
 <Taras_Bohdanovych_Hlukhovetskyi@external.mckinsey.com>
Date: Fri, 26 Jun 2026 17:09:00 +0300
Subject: [PATCH] [FIX] [Navbar] Nuclio options are not highlighted after
 selection

---
 .../SidebarCollapseItem/SidebarCollapseItem.jsx     | 11 ++++++++---
 .../shared/Sidebar/SidebarItem/SidebarItem.jsx      | 13 +++++++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/nextGenComponents/shared/Sidebar/SidebarCollapseItem/SidebarCollapseItem.jsx b/src/nextGenComponents/shared/Sidebar/SidebarCollapseItem/SidebarCollapseItem.jsx
index 7441ee41d..64d853241 100644
--- a/src/nextGenComponents/shared/Sidebar/SidebarCollapseItem/SidebarCollapseItem.jsx
+++ b/src/nextGenComponents/shared/Sidebar/SidebarCollapseItem/SidebarCollapseItem.jsx
@@ -38,9 +38,14 @@ const SidebarCollapseItem = ({ icon, label, nestedLinks }) => {
   const [open, setOpen] = useState(false)
   const { open: sidebarOpen } = useSidebar()
 
-  const isAnyChildActive = nestedLinks.some(nested =>
-    nested.link ? pathname.includes(nested.link.toLowerCase()) : false
-  )
+  const isAnyChildActive = nestedLinks.some(nested => {
+    if (!nested.link) return false
+    try {
+      return pathname.toLowerCase().startsWith(new URL(nested.link).pathname.toLowerCase())
+    } catch {
+      return pathname.toLowerCase().startsWith(nested.link.toLowerCase())
+    }
+  })
 
   return (
     <Collapsible
diff --git a/src/nextGenComponents/shared/Sidebar/SidebarItem/SidebarItem.jsx b/src/nextGenComponents/shared/Sidebar/SidebarItem/SidebarItem.jsx
index b6b399fcc..a1eb6ea0d 100644
--- a/src/nextGenComponents/shared/Sidebar/SidebarItem/SidebarItem.jsx
+++ b/src/nextGenComponents/shared/Sidebar/SidebarItem/SidebarItem.jsx
@@ -17,7 +17,7 @@ illegal under applicable law, and the grant of the foregoing license
 under the Apache 2.0 license is conditioned upon your compliance with
 such restriction.
 */
-import { useEffect, useRef } from 'react'
+import { useEffect, useMemo, useRef } from 'react'
 import PropTypes from 'prop-types'
 import { Link, useMatch } from 'react-router-dom'
 import { SidebarMenuButton, SidebarMenuItem, useSidebar } from 'igz-controls/nextGenComponents'
@@ -34,7 +34,16 @@ const SidebarItem = ({
   const ref = useRef(null)
   const { open: sidebarOpen } = useSidebar()
 
-  const match = useMatch(link ? `${link}/*` : null)
+  const linkPath = useMemo(() => {
+    if (!link) return null
+    try {
+      return new URL(link).pathname
+    } catch {
+      return link
+    }
+  }, [link])
+
+  const match = useMatch(linkPath ? `${linkPath}/*` : null)
   const isActive = Boolean(match)
 
   useEffect(() => {