1-
21import React , { useState } from 'react' ;
32import { connect } from 'react-redux' ;
43import * as moment from 'moment' ;
@@ -18,7 +17,7 @@ import {
1817 NavLink ,
1918 useParams
2019} from "react-router-dom" ;
21-
20+
2221const clickOutsideConfig = {
2322 handleClickOutside : ( ) => Navbar . handleClickOutside
2423} ;
@@ -27,11 +26,10 @@ function Navbar(props) {
2726 const [ adminToolsOpen , setAdminToolsOpen ] = useState ( false ) ;
2827 const toggleAdminToolsOpen = ( ) => setAdminToolsOpen ( ! adminToolsOpen ) ;
2928 const [ orgToolsOpen , setOrgToolsOpen ] = useState ( false ) ;
30-
3129 const { orgId } = useParams ( ) ;
3230
3331 Navbar . handleClickOutside = ( ) => { setAdminToolsOpen ( false ) }
34-
32+
3533 const formatLastUpdated = ( ) => {
3634 const { lastUpdated, metric } = props ;
3735 if ( ! lastUpdated ) {
@@ -55,7 +53,7 @@ function Navbar(props) {
5553
5654 const renderConnectivity = ( ) => {
5755 const { dispatch, realTimeUpdates, user } = props ;
58-
56+
5957 if ( ! user . username ) {
6058 return null ;
6159 }
@@ -71,7 +69,7 @@ function Navbar(props) {
7169 }
7270 } }
7371 style = { { color : realTimeUpdates ? '' : '' } } >
74-
72+
7573 { realTimeUpdates && `Last update: ${ formatLastUpdated ( ) } ⚡` }
7674 { ! realTimeUpdates && 'Real-time disconnected ' }
7775 { ! realTimeUpdates && < img src = { xcloudSvg } width = "24" height = "24" /> }
@@ -171,7 +169,7 @@ function Navbar(props) {
171169 return (
172170 < ul className = "nav navbar-nav navbar-right" >
173171 { isAdmin && ! orgId ? renderSiteAdminNav ( ) :
174- user . username &&
172+ user . username &&
175173 < li >
176174 < NavLink to = "/orgs" activeClassName = "active-nav" > Back To Organizations</ NavLink >
177175 </ li > }
@@ -189,10 +187,9 @@ function Navbar(props) {
189187 < li >
190188 < NavLink exact to = "/" activeClassName = "active-nav" > ☰</ NavLink >
191189 </ li >
192- </ ul >
190+ </ ul >
193191 ) ;
194-
195- }
192+ }
196193
197194 const { orgsByID } = props ;
198195
@@ -210,10 +207,10 @@ function Navbar(props) {
210207 < a > { getWelcomeText ( ) } </ a >
211208 < br />
212209 { renderConnectivity ( ) }
213- </ li >
210+ </ li >
214211 </ div >
215- { renderLeftNav ( ) }
216- { renderRightNav ( ) }
212+ { renderLeftNav ( ) }
213+ { renderRightNav ( ) }
217214 </ div >
218215 </ nav >
219216 ) ;
0 commit comments