@@ -14,8 +14,6 @@ import {
1414 Settings ,
1515 ChevronDown ,
1616 ChevronRight ,
17- PanelLeftClose ,
18- PanelLeft ,
1917 Puzzle ,
2018 History ,
2119 Radio ,
@@ -58,19 +56,22 @@ export function Sidebar() {
5856 const { t } = useTranslation ( ) ;
5957 const location = useLocation ( ) ;
6058 const navigate = useNavigate ( ) ;
61- const { sidebarCollapsed, toggleSidebar } = useAppStore ( ) ;
59+ const { sidebarCollapsed } = useAppStore ( ) ;
6260 const { globalAdmin } = useAuthStore ( ) ;
6361 const { version, startupMode, functionMode, copilotEnabled, aiEnabled } = useServerStore ( ) ;
6462 const { currentNamespace, namespaceShowName } = useNamespaceStore ( ) ;
65- const [ platformOpen , setPlatformOpen ] = useState ( false ) ;
66-
67- // Auto-expand platform section if current path is within it
68- useEffect ( ( ) => {
69- const platformPaths = [ '/namespace' , '/clusterManagement' , '/pluginManagement' , '/userManagement' , '/rolesManagement' , '/permissionsManagement' ] ;
70- if ( platformPaths . some ( ( p ) => location . pathname === p ) ) {
71- setPlatformOpen ( true ) ;
72- }
73- } , [ location . pathname ] ) ;
63+ const platformPaths = [
64+ '/namespace' ,
65+ '/clusterManagement' ,
66+ '/pluginManagement' ,
67+ '/userManagement' ,
68+ '/rolesManagement' ,
69+ '/permissionsManagement' ,
70+ '/settingCenter' ,
71+ ] ;
72+ const platformActive = platformPaths . some ( ( p ) => location . pathname === p ) ;
73+ const [ platformOpen , setPlatformOpen ] = useState ( platformActive ) ;
74+ const platformExpanded = platformOpen || platformActive ;
7475
7576 const coreItems : NavItem [ ] = [ ] ;
7677
@@ -151,6 +152,15 @@ export function Sidebar() {
151152 } ) ;
152153 }
153154
155+ if ( copilotEnabled ) {
156+ platformItems . push ( {
157+ key : 'settings' ,
158+ label : t ( 'menu.settingCenter' ) ,
159+ icon : < Settings size = { 18 } /> ,
160+ path : '/settingCenter' ,
161+ } ) ;
162+ }
163+
154164 const navTo = useCallback (
155165 ( url : string ) => {
156166 const params = new URLSearchParams ( ) ;
@@ -276,9 +286,9 @@ export function Sidebar() {
276286 )
277287 )
278288 ) : (
279- < Collapsible open = { platformOpen } onOpenChange = { setPlatformOpen } >
289+ < Collapsible open = { platformExpanded } onOpenChange = { setPlatformOpen } >
280290 < CollapsibleTrigger className = "flex w-full items-center gap-2 rounded-md px-2 py-2 text-[10px] font-semibold uppercase tracking-wider text-muted-foreground hover:text-foreground transition-colors" >
281- { platformOpen ? < ChevronDown size = { 12 } /> : < ChevronRight size = { 12 } /> }
291+ { platformExpanded ? < ChevronDown size = { 12 } /> : < ChevronRight size = { 12 } /> }
282292 { t ( 'menu.platformManagement' ) }
283293 </ CollapsibleTrigger >
284294 < CollapsibleContent className = "space-y-1" >
@@ -310,33 +320,13 @@ export function Sidebar() {
310320 </ ScrollArea >
311321
312322 { /* Bottom Section */ }
313- < div className = "border-t border-sidebar-border p -2 space-y-1 " >
323+ < div className = "border-t border-sidebar-border px -2 py-3 " >
314324 { ! sidebarCollapsed && (
315- < div className = "px-3 py-1.5 text-xs text-muted-foreground text-center " >
325+ < div className = "min-h-5 px-2 text-center text-xs leading-5 text-muted-foreground" >
316326 { version && `v${ version } ` }
317327 { startupMode && ` · ${ startupMode } ` }
318328 </ div >
319329 ) }
320- { copilotEnabled && (
321- < NavLink
322- item = { {
323- key : 'settings' ,
324- label : t ( 'menu.settingCenter' ) ,
325- icon : < Settings size = { 18 } /> ,
326- path : '/settingCenter' ,
327- } }
328- collapsed = { sidebarCollapsed }
329- active = { isActive ( '/settingCenter' ) }
330- onClick = { ( ) => navTo ( '/settingCenter' ) }
331- />
332- ) }
333- < button
334- onClick = { toggleSidebar }
335- className = "flex w-full items-center justify-center gap-2 rounded-md px-2 py-2 text-muted-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground transition-colors"
336- >
337- { sidebarCollapsed ? < PanelLeft size = { 18 } /> : < PanelLeftClose size = { 18 } /> }
338- { ! sidebarCollapsed && < span className = "text-xs" > { t ( 'common.collapse' ) || 'Collapse' } </ span > }
339- </ button >
340330 </ div >
341331 </ aside >
342332 ) ;
@@ -409,10 +399,7 @@ function NavGroup({
409399 const [ open , setOpen ] = useState ( isGroupActive || ! ! item . defaultOpen ) ;
410400 const [ flyoutOpen , setFlyoutOpen ] = useState ( false ) ;
411401 const closeTimer = useRef < ReturnType < typeof setTimeout > | null > ( null ) ;
412-
413- useEffect ( ( ) => {
414- if ( isGroupActive ) setOpen ( true ) ;
415- } , [ isGroupActive ] ) ;
402+ const expanded = open || isGroupActive ;
416403
417404 useEffect ( ( ) => {
418405 return ( ) => { if ( closeTimer . current ) clearTimeout ( closeTimer . current ) ; } ;
@@ -499,7 +486,7 @@ function NavGroup({
499486 }
500487
501488 return (
502- < Collapsible open = { open } onOpenChange = { setOpen } >
489+ < Collapsible open = { expanded } onOpenChange = { setOpen } >
503490 < CollapsibleTrigger className = "flex w-full items-center gap-3 rounded-lg px-3 py-2 text-sm font-medium text-sidebar-foreground hover:bg-sidebar-accent/60 transition-all duration-200" >
504491 < span className = "shrink-0" > { item . icon } </ span >
505492 < span className = "truncate flex-1 text-left" > { item . label } </ span >
@@ -508,7 +495,7 @@ function NavGroup({
508495 { item . badge }
509496 </ Badge >
510497 ) }
511- { open ? < ChevronDown size = { 14 } /> : < ChevronRight size = { 14 } /> }
498+ { expanded ? < ChevronDown size = { 14 } /> : < ChevronRight size = { 14 } /> }
512499 </ CollapsibleTrigger >
513500 < CollapsibleContent className = "ml-4 space-y-0.5 border-l border-sidebar-border pl-3 mt-0.5" >
514501 { item . children ?. map ( ( child ) => (
0 commit comments