[UI] Nav cleanup

This commit is contained in:
Oleg Shuralev 2020-01-08 03:18:49 +03:00
parent 74b0c000da
commit 5a94e9084f
No known key found for this signature in database
GPG key ID: 0459DF80E1A2FD1B
2 changed files with 6 additions and 3 deletions

View file

@ -2,6 +2,7 @@ import React from 'react';
import { import {
Switch, Switch,
Route, Route,
Redirect,
} from 'react-router-dom'; } from 'react-router-dom';
import './App.scss'; import './App.scss';
import BrokersContainer from './Brokers/BrokersContainer'; import BrokersContainer from './Brokers/BrokersContainer';
@ -33,11 +34,13 @@ const App: React.FC<AppProps> = ({
<NavConatiner className="Layout__navbar" /> <NavConatiner className="Layout__navbar" />
{isClusterListFetched ? ( {isClusterListFetched ? (
<Switch> <Switch>
<Route path="/clusters/:clusterId/topics" component={TopicsContainer} />
<Route path="/clusters/:clusterId/brokers" component={BrokersContainer} />
<Route exact path="/"> <Route exact path="/">
Dashboard Dashboard
</Route> </Route>
<Route path="/clusters/:clusterId/topics" component={TopicsContainer} />
<Route path="/clusters/:clusterId/brokers" component={BrokersContainer} />
<Redirect from="/clusters/:clusterId" to="/clusters/:clusterId/brokers" />
</Switch> </Switch>
) : ( ) : (
<PageLoader /> <PageLoader />

View file

@ -26,7 +26,7 @@ const ClusterMenu: React.FC<Props> = ({
}) => ( }) => (
<ul className="menu-list"> <ul className="menu-list">
<li> <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 />} {defaultCluster && <DefaultIcon />}
{name} {name}
</NavLink> </NavLink>