hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

fix merge-conflicts

Browse Source 
Signed-off-by: Roman <ixrock@gmail.com>
This commit is contained in:
Roman 2020-12-18 15:55:09 +02:00
parent 69e5e5eaab
commit 8ce222ecec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/renderer/components/layout/sidebar.tsx
View File

@ -101,7 +101,7 @@ export class Sidebar extends React.Component<Props> {
renderRegisteredMenus() { renderRegisteredMenus() {
return clusterPageMenuRegistry.getRootItems().map((menuItem, index) => { return clusterPageMenuRegistry.getRootItems().map((menuItem, index) => {
const registeredPage = clusterPageRegistry.getByPageMenuTarget(menuItem.target); const registeredPage = clusterPageRegistry.getByPageTarget(menuItem.target);
const tabRoutes = this.getTabLayoutRoutes(menuItem); const tabRoutes = this.getTabLayoutRoutes(menuItem);
const id = `registered-item-${index}`; const id = `registered-item-${index}`;
let pageUrl: string; let pageUrl: string;
@ -111,7 +111,7 @@ export class Sidebar extends React.Component<Props> {
const { extensionId, id: pageId } = registeredPage; const { extensionId, id: pageId } = registeredPage;
pageUrl = getExtensionPageUrl({ extensionId, pageId, params: menuItem.target.params }); pageUrl = getExtensionPageUrl({ extensionId, pageId, params: menuItem.target.params });
isActive = isActiveRoute(registeredPage.routePath); isActive = isActiveRoute(registeredPage.url);
} else if (tabRoutes.length > 0) { } else if (tabRoutes.length > 0) {
pageUrl = tabRoutes[0].url; pageUrl = tabRoutes[0].url;
isActive = isActiveRoute(tabRoutes.map((tab) => tab.routePath)); isActive = isActiveRoute(tabRoutes.map((tab) => tab.routePath));