X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fframework%2Fwidgets%2Fskyquake_nav%2FskyquakeNav.jsx;h=51a21a02128b43f9788eb042dc410ab3569f93d0;hb=98ede33d3f1b2c7c05db14c00400bbde49f3fe9c;hp=a61ee541b6bf9d952af32a120bf5d13f3fbc6586;hpb=5fe8f677ae26b665ef8239086e520da56f675939;p=osm%2FUI.git
diff --git a/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx b/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx
index a61ee541b..51a21a021 100644
--- a/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx
+++ b/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx
@@ -63,21 +63,28 @@ class SelectProject extends React.Component {
render() {
let props = this.props;
let currentValue = JSON.stringify(props.currentProject);
- let projects = this.props.projects.map((p,i) => {
+ let projects = this.props.projects && this.props.projects.map((p,i) => {
return {
label: p.name,
value: p.name
}
});
+ let hasProjects = (this.props.projects && (this.props.projects.length > 0))
return (
- Project:
-
+ {
+ hasProjects ? 'Project:' : 'No Projects Assigned'
+ }
+ {
+ hasProjects ?
+
+ : null
+ }
)
}
@@ -96,12 +103,16 @@ class UserNav extends React.Component {
}
render() {
let props = this.props;
+ let userProfileLink = '';
+ this.props.nav['user_management'] && this.props.nav['user_management'].routes.map((r) => {
+ if(r.unique) {
+ userProfileLink = returnLinkItem(r, props.currentUser)
+ }
+ })
return (
@@ -205,12 +216,12 @@ export function buildNavListItem (k, link, index) {
* @param {object} link Routing information from nav object.
* @return {object} component returns a react component that links to a new route.
*/
-export function returnLinkItem(link) {
+export function returnLinkItem(link, label) {
let ref;
let route = link.route;
if(link.isExternal) {
ref = (
- {link.label}
+ {label || link.label}
)
} else {
if(link.path && link.path.replace(' ', '') != '') {
@@ -225,8 +236,8 @@ export function returnLinkItem(link) {
}
}
ref = (
-
- {link.label}
+
+ {label || link.label}
)
}
@@ -255,7 +266,8 @@ export function buildNav(nav, currentPlugin, props) {
projects={props.projects}
currentProject={props.currentProject} />
+ currentUser={props.currentUser}
+ nav={nav} />
)
for (let k in nav) {