From 5a94e9084fd67380d115b6a1509bd06a6078e1bb Mon Sep 17 00:00:00 2001
From: Oleg Shuralev <workshur@gmail.com>
Date: Wed, 8 Jan 2020 03:18:49 +0300
Subject: [PATCH] [UI] Nav cleanup

---
 frontend/src/components/App.tsx             | 7 +++++--
 frontend/src/components/Nav/ClusterMenu.tsx | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/App.tsx b/frontend/src/components/App.tsx
index 6b8a614868..752ee4bcff 100644
--- a/frontend/src/components/App.tsx
+++ b/frontend/src/components/App.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import {
   Switch,
   Route,
+  Redirect,
 } from 'react-router-dom';
 import './App.scss';
 import BrokersContainer from './Brokers/BrokersContainer';
@@ -33,11 +34,13 @@ const App: React.FC<AppProps> = ({
         <NavConatiner className="Layout__navbar" />
         {isClusterListFetched ? (
           <Switch>
-            <Route path="/clusters/:clusterId/topics" component={TopicsContainer} />
-            <Route path="/clusters/:clusterId/brokers" component={BrokersContainer} />
             <Route exact path="/">
               Dashboard
             </Route>
+
+            <Route path="/clusters/:clusterId/topics" component={TopicsContainer} />
+            <Route path="/clusters/:clusterId/brokers" component={BrokersContainer} />
+            <Redirect from="/clusters/:clusterId" to="/clusters/:clusterId/brokers" />
           </Switch>
         ) : (
           <PageLoader />
diff --git a/frontend/src/components/Nav/ClusterMenu.tsx b/frontend/src/components/Nav/ClusterMenu.tsx
index 1c533f5f7f..886069127d 100644
--- a/frontend/src/components/Nav/ClusterMenu.tsx
+++ b/frontend/src/components/Nav/ClusterMenu.tsx
@@ -26,7 +26,7 @@ const ClusterMenu: React.FC<Props> = ({
 }) => (
   <ul className="menu-list">
     <li>
-      <NavLink exact to={`/clusters/${id}`} activeClassName="is-active" title={name} className="has-text-overflow-ellipsis">
+      <NavLink exact to={`/clusters/${id}/brokers`} title={name} className="has-text-overflow-ellipsis">
         {defaultCluster && <DefaultIcon />}
         {name}
       </NavLink>