feat: merged sidebar component

roncodes · roncodes · commit 2fc793b29d5c · 2025-11-28T10:55:35.000+08:00
diff --git a/addon/components/layout/fleet-ops-sidebar.js b/addon/components/layout/fleet-ops-sidebar.js
@@ -25,13 +25,8 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
     }
 
     createMenuItemsFromUniverseRegistry() {
-<<<<<<< HEAD
-        const registeredMenuItems = this.registryService.getMenuItems('engine:fleet-ops');
-        this.universeMenuPanels = this.registryService.getMenuPanels('engine:fleet-ops');
-=======
         const registeredMenuItems = this.registryService.getRegistry('engine:fleet-ops');
         this.universeMenuPanels = this.registryService.getRegistry('engine:fleet-ops:panels');
->>>>>>> 623fa0c66165ea9b466e06f811d9477f1a8f2380
         this.universeMenuItems = registeredMenuItems.filter((menuItem) => menuItem.section === undefined);
         this.universeSettingsMenuItems = registeredMenuItems.filter((menuItem) => menuItem.section === 'settings');
     }

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,8 @@ export default class LayoutFleetOpsSidebarComponent extends Component {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`createMenuItemsFromUniverseRegistry() {`
`28`		`-<<<<<<< HEAD`
`29`		`- const registeredMenuItems = this.registryService.getMenuItems('engine:fleet-ops');`
`30`		`- this.universeMenuPanels = this.registryService.getMenuPanels('engine:fleet-ops');`
`31`		`-=======`
`32`	`28`	`const registeredMenuItems = this.registryService.getRegistry('engine:fleet-ops');`
`33`	`29`	`this.universeMenuPanels = this.registryService.getRegistry('engine:fleet-ops:panels');`
`34`		`->>>>>>> 623fa0c66165ea9b466e06f811d9477f1a8f2380`
`35`	`30`	`this.universeMenuItems = registeredMenuItems.filter((menuItem) => menuItem.section === undefined);`
`36`	`31`	`this.universeSettingsMenuItems = registeredMenuItems.filter((menuItem) => menuItem.section === 'settings');`
`37`	`32`	`}`