Using singe <TopBar/>

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

src/renderer/components/+catalog/catalog.tsx

@@ -43,7 +43,6 @@ import { catalogURL, CatalogViewRouteParam } from "../../../common/routes";
 import { CatalogMenu } from "./catalog-menu";
 import { HotbarIcon } from "../hotbar/hotbar-icon";
 import { RenderDelay } from "../render-delay/render-delay";
-import { TopBar } from "../layout/topbar";
 
 export const previousActiveTab = createAppStorage("catalog-previous-active-tab", "");
 
@@ -245,8 +244,6 @@ export class Catalog extends React.Component<Props> {
     }
 
     return (
-      <>
-        <TopBar/>
       <MainLayout sidebar={this.renderNavigation()}>
         <div className="p-6 h-full">
           { this.renderList() }
@@ -266,7 +263,6 @@ export class Catalog extends React.Component<Props> {
             )
         }
       </MainLayout>
-      </>
     );
   }
 }

src/renderer/components/+welcome/welcome.tsx

@@ -27,7 +27,6 @@ import { Icon } from "../icon";
 import { productName, slackUrl } from "../../../common/vars";
 import { WelcomeMenuRegistry } from "../../../extensions/registries";
 import { WelcomeBannerRegistry } from "../../../extensions/registries";
-import { TopBar } from "../layout/topbar";
 
 export const defaultWidth = 320;
 
@@ -48,8 +47,6 @@ export class Welcome extends React.Component {
     }, defaultWidth);
 
     return (
-      <>
-        <TopBar/>
       <div className="flex justify-center Welcome align-center">
         <div style={{ width: `${maxWidth}px` }} data-testid="welcome-banner-container">
           {welcomeBanner.length > 0 ? (
@@ -97,7 +94,6 @@ export class Welcome extends React.Component {
           </div>
         </div>
       </div>
-      </>
     );
   }
 }

src/renderer/components/cluster-manager/cluster-manager.scss

@@ -24,7 +24,7 @@
 
   display: grid;
   grid-template-areas:
-    "menu topbar"
+    "topbar topbar"
     "menu main"
     "bottom-bar bottom-bar";
   grid-template-rows: auto 1fr min-content;

src/renderer/components/cluster-manager/cluster-manager.tsx

@@ -38,6 +38,7 @@ import * as routes from "../../../common/routes";
 import { reaction } from "mobx";
 import { navigation } from "../../navigation";
 import { setEntityOnRouteMatch } from "../../../main/catalog-sources/helpers/general-active-sync";
+import { TopBar } from "../layout/topbar";
 
 @observer
 export class ClusterManager extends React.Component {
@@ -50,6 +51,7 @@ export class ClusterManager extends React.Component {
   render() {
     return (
       <div className="ClusterManager">
+        <TopBar/>
         <main>
           <div id="lens-views"/>
           <Switch>

src/renderer/components/cluster-manager/cluster-view.tsx

@@ -34,7 +34,6 @@ import { catalogEntityRegistry } from "../../api/catalog-entity-registry";
 import { navigate } from "../../navigation";
 import { catalogURL, ClusterViewRouteParams } from "../../../common/routes";
 import { previousActiveTab } from "../+catalog";
-import { TopBar } from "../layout/topbar";
 
 interface Props extends RouteComponentProps<ClusterViewRouteParams> {
 }
@@ -105,7 +104,6 @@ export class ClusterView extends React.Component<Props> {
   render() {
     return (
       <div className="ClusterView flex column align-center">
-        <TopBar/>
         {this.renderStatus()}
       </div>
     );