From 8ce222ecec2c3e6045f920762d27c7b67995fc40 Mon Sep 17 00:00:00 2001 From: Roman Date: Fri, 18 Dec 2020 15:55:09 +0200 Subject: [PATCH] fix merge-conflicts Signed-off-by: Roman --- src/renderer/components/layout/sidebar.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/components/layout/sidebar.tsx b/src/renderer/components/layout/sidebar.tsx index c26a2e5a96..c8de3d2116 100644 --- a/src/renderer/components/layout/sidebar.tsx +++ b/src/renderer/components/layout/sidebar.tsx @@ -101,7 +101,7 @@ export class Sidebar extends React.Component { renderRegisteredMenus() { return clusterPageMenuRegistry.getRootItems().map((menuItem, index) => { - const registeredPage = clusterPageRegistry.getByPageMenuTarget(menuItem.target); + const registeredPage = clusterPageRegistry.getByPageTarget(menuItem.target); const tabRoutes = this.getTabLayoutRoutes(menuItem); const id = `registered-item-${index}`; let pageUrl: string; @@ -111,7 +111,7 @@ export class Sidebar extends React.Component { const { extensionId, id: pageId } = registeredPage; pageUrl = getExtensionPageUrl({ extensionId, pageId, params: menuItem.target.params }); - isActive = isActiveRoute(registeredPage.routePath); + isActive = isActiveRoute(registeredPage.url); } else if (tabRoutes.length > 0) { pageUrl = tabRoutes[0].url; isActive = isActiveRoute(tabRoutes.map((tab) => tab.routePath));