X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fframework%2Fwidgets%2Fskyquake_nav%2FskyquakeNav.jsx;h=99d14829244bd57c550c730a5ce0daab44e1ff9b;hp=51a21a02128b43f9788eb042dc410ab3569f93d0;hb=9be8b4847b580cea9e28d2f2a02166753c29b58e;hpb=7302dfb98687690908844f331861aec374e95ed9 diff --git a/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx b/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx index 51a21a021..99d148292 100644 --- a/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx +++ b/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx @@ -25,9 +25,11 @@ import 'style/common.scss'; import './skyquakeNav.scss'; import SelectOption from '../form_controls/selectOption.jsx'; import {FormSection} from '../form_controls/formControls.jsx'; +import {isRBACValid, SkyquakeRBAC} from 'widgets/skyquake_rbac/skyquakeRBAC.jsx'; //Temporary, until api server is on same port as webserver -var rw = require('utils/rw.js'); +import rw from 'utils/rw.js'; + var API_SERVER = rw.getSearchParams(window.location).api_server; var UPLOAD_SERVER = rw.getSearchParams(window.location).upload_server; @@ -35,23 +37,6 @@ var UPLOAD_SERVER = rw.getSearchParams(window.location).upload_server; // Internal classes/functions // -class LogoutAppMenuItem extends React.Component { - handleLogout() { - Utils.clearAuthentication(); - } - render() { - return ( -
-

- - Logout - -

-
- ); - } -} - class SelectProject extends React.Component { constructor(props) { super(props); @@ -112,7 +97,7 @@ class UserNav extends React.Component { return (

- {userProfileLink} + USER: {userProfileLink}