diff --git a/src/extensions/registries/page-menu-registry.ts b/src/extensions/registries/page-menu-registry.ts index 961925c885..53131f507b 100644 --- a/src/extensions/registries/page-menu-registry.ts +++ b/src/extensions/registries/page-menu-registry.ts @@ -49,21 +49,21 @@ export class ClusterPageMenuRegistry extends BaseRegistry !item.parentId) + return this.getItems().filter((item) => !item.parentId); } getSubItems(parent: ClusterPageMenuRegistration) { - return this.getItems().filter((item) => item.parentId === parent.id && item.target.extensionId === parent.target.extensionId) + return this.getItems().filter((item) => item.parentId === parent.id && item.target.extensionId === parent.target.extensionId); } getByPage(page: RegisteredPage) { - return this.getItems().find((item) => item.target?.pageId == page.id && item.target?.extensionId === page.extensionId) + return this.getItems().find((item) => item.target?.pageId == page.id && item.target?.extensionId === page.extensionId); } } diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx index 75cb6c9bb1..7aea1125ad 100755 --- a/src/renderer/components/app.tsx +++ b/src/renderer/components/app.tsx @@ -97,18 +97,18 @@ export class App extends React.Component { renderExtensionTabLayoutRoutes() { return clusterPageMenuRegistry.getRootItems().map((menu, index) => { - const tabRoutes = this.getTabLayoutRoutes(menu) + const tabRoutes = this.getTabLayoutRoutes(menu); if (tabRoutes.length > 0) { - const pageComponent = () => - return + const pageComponent = () => ; + return ; } else { - const page = clusterPageRegistry.getByPageMenuTarget(menu.target) + const page = clusterPageRegistry.getByPageMenuTarget(menu.target); if (page) { - const pageComponent = () => - return + const pageComponent = () => ; + return ; } } - }) + }); } renderExtensionRoutes() { diff --git a/src/renderer/components/layout/sidebar.tsx b/src/renderer/components/layout/sidebar.tsx index 57ba8e3808..7714d1600e 100644 --- a/src/renderer/components/layout/sidebar.tsx +++ b/src/renderer/components/layout/sidebar.tsx @@ -214,16 +214,16 @@ export class Sidebar extends React.Component { {clusterPageMenuRegistry.getRootItems().map((menuItem) => { const registeredPage = clusterPageRegistry.getByPageMenuTarget(menuItem.target); - let pageUrl: string - let isActive = false + let pageUrl: string; + let isActive = false; if (registeredPage) { const { extensionId, id: pageId } = registeredPage; pageUrl = getExtensionPageUrl({ extensionId, pageId, params: menuItem.target.params }); isActive = pageUrl === navigation.location.pathname; } - const tabRoutes = this.getTabLayoutRoutes(menuItem) + const tabRoutes = this.getTabLayoutRoutes(menuItem); if (!registeredPage && tabRoutes.length == 0) { - return + return; } return (